diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-12-14 20:40:32 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-12-14 20:40:32 +1100 |
| commit | 1901d8bb45c3b82335c48e6232871f72ad10ed95 (patch) | |
| tree | 8e386d105cec283147bd56e716de69299cc54fbc /arch/powerpc/include/asm/reg.h | |
| parent | 801c0b2c4db3a33d56b3e19240df7b897e5bbfbc (diff) | |
| parent | 7f821fc9c77a9b01fe7b1d6e72717b33d8d64142 (diff) | |
| download | linux-1901d8bb45c3b82335c48e6232871f72ad10ed95.tar.gz linux-1901d8bb45c3b82335c48e6232871f72ad10ed95.tar.bz2 linux-1901d8bb45c3b82335c48e6232871f72ad10ed95.zip | |
Merge tag 'powerpc-4.4-3' into next
Merge the two TM fixes we merged in 4.4. We are about to merge selftests
for these, and without the fixes the selftests will oops.
powerpc fixes for 4.4 #2
- tm: Block signal return from setting invalid MSR state from Michael Neuling
- tm: Check for already reclaimed tasks from Michael Neuling
Diffstat (limited to 'arch/powerpc/include/asm/reg.h')
| -rw-r--r-- | arch/powerpc/include/asm/reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index eb2986e60c50..c4cb2ffc624e 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -108,6 +108,7 @@ #define MSR_TS_T __MASK(MSR_TS_T_LG) /* Transaction Transactional */ #define MSR_TS_MASK (MSR_TS_T | MSR_TS_S) /* Transaction State bits */ #define MSR_TM_ACTIVE(x) (((x) & MSR_TS_MASK) != 0) /* Transaction active? */ +#define MSR_TM_RESV(x) (((x) & MSR_TS_MASK) == MSR_TS_MASK) /* Reserved */ #define MSR_TM_TRANSACTIONAL(x) (((x) & MSR_TS_MASK) == MSR_TS_T) #define MSR_TM_SUSPENDED(x) (((x) & MSR_TS_MASK) == MSR_TS_S) |