diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-23 22:43:18 +0100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-23 22:43:18 +0100 |
commit | a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a (patch) | |
tree | 1d2061bbf8ac521bb9839075beb4263752bebb23 /arch/powerpc/include/asm/paca.h | |
parent | powerpc: dts: replace 'linux,stdout-path' with 'stdout-path' (diff) | |
parent | KVM: PPC: Book3S HV: Work around TEXASR bug in fake suspend state (diff) | |
download | linux-a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a.tar.xz linux-a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a.zip |
Merge branch 'topic/ppc-kvm' into next
This brings in two series from Paul, one of which touches KVM code and
may need to be merged into the kvm-ppc tree to resolve conflicts.
Diffstat (limited to 'arch/powerpc/include/asm/paca.h')
-rw-r--r-- | arch/powerpc/include/asm/paca.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h index d2bf71dddbef..c97b41185ab7 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -32,6 +32,7 @@ #include <asm/accounting.h> #include <asm/hmi.h> #include <asm/cpuidle.h> +#include <asm/atomic.h> register struct paca_struct *local_paca asm("r13"); @@ -177,6 +178,8 @@ struct paca_struct { u8 thread_mask; /* Mask to denote subcore sibling threads */ u8 subcore_sibling_mask; + /* Flag to request this thread not to stop */ + atomic_t dont_stop; /* * Pointer to an array which contains pointer * to the sibling threads' paca. |