diff options
author | Anton Blanchard <anton@samba.org> | 2013-08-06 12:01:20 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-13 21:50:21 -0400 |
commit | 594bd38303b489156c005177ccb4af52f942e2f5 (patch) | |
tree | 21c9ccae1216900ea6ce2a4314065ebc3e879db0 /arch/powerpc/include | |
parent | 230aef7a6a23b6166bd4003bfff5af23c9bd381f (diff) |
powerpc: Wrap MSR macros with parentheses
Not having parentheses around a macro is asking for trouble.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/reg.h | 8 | ||||
-rw-r--r-- | arch/powerpc/include/asm/reg_booke.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index a6840e4e24f7..a312e0c8cef4 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h | |||
@@ -115,10 +115,10 @@ | |||
115 | #define MSR_64BIT MSR_SF | 115 | #define MSR_64BIT MSR_SF |
116 | 116 | ||
117 | /* Server variant */ | 117 | /* Server variant */ |
118 | #define MSR_ MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_ISF |MSR_HV | 118 | #define MSR_ (MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_ISF |MSR_HV) |
119 | #define MSR_KERNEL MSR_ | MSR_64BIT | 119 | #define MSR_KERNEL (MSR_ | MSR_64BIT) |
120 | #define MSR_USER32 MSR_ | MSR_PR | MSR_EE | 120 | #define MSR_USER32 (MSR_ | MSR_PR | MSR_EE) |
121 | #define MSR_USER64 MSR_USER32 | MSR_64BIT | 121 | #define MSR_USER64 (MSR_USER32 | MSR_64BIT) |
122 | #elif defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_8xx) | 122 | #elif defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_8xx) |
123 | /* Default MSR for kernel mode. */ | 123 | /* Default MSR for kernel mode. */ |
124 | #define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR) | 124 | #define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR) |
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h index b417de3cc2c4..ed8f836da094 100644 --- a/arch/powerpc/include/asm/reg_booke.h +++ b/arch/powerpc/include/asm/reg_booke.h | |||
@@ -29,10 +29,10 @@ | |||
29 | #if defined(CONFIG_PPC_BOOK3E_64) | 29 | #if defined(CONFIG_PPC_BOOK3E_64) |
30 | #define MSR_64BIT MSR_CM | 30 | #define MSR_64BIT MSR_CM |
31 | 31 | ||
32 | #define MSR_ MSR_ME | MSR_CE | 32 | #define MSR_ (MSR_ME | MSR_CE) |
33 | #define MSR_KERNEL MSR_ | MSR_64BIT | 33 | #define MSR_KERNEL (MSR_ | MSR_64BIT) |
34 | #define MSR_USER32 MSR_ | MSR_PR | MSR_EE | 34 | #define MSR_USER32 (MSR_ | MSR_PR | MSR_EE) |
35 | #define MSR_USER64 MSR_USER32 | MSR_64BIT | 35 | #define MSR_USER64 (MSR_USER32 | MSR_64BIT) |
36 | #elif defined (CONFIG_40x) | 36 | #elif defined (CONFIG_40x) |
37 | #define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR|MSR_CE) | 37 | #define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR|MSR_CE) |
38 | #define MSR_USER (MSR_KERNEL|MSR_PR|MSR_EE) | 38 | #define MSR_USER (MSR_KERNEL|MSR_PR|MSR_EE) |