diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-10 18:20:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-10 18:20:48 +0000 |
| commit | 0e770f4e70e8221454854b962adc258b6035ecdd (patch) | |
| tree | db146cb0453047b334e6cc882fda74fd7cba3525 /arch/powerpc/include/asm/reg.h | |
| parent | a69ce65274ff1589bb64ea782a4178d7210da0bb (diff) | |
| parent | cd6f5814252060db2d38f57c602db33696c549c0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.02-android
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 795f67792ea9..60c31698f7d5 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) |