Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 594bd383 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc: Wrap MSR macros with parentheses 



Not having parentheses around a macro is asking for trouble.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 230aef7a

arch/powerpc/include/asm/reg.h

+4 −4
Original line number Diff line number Diff line
@@ -115,10 +115,10 @@ 
#define MSR_64BIT	MSR_SF



/* Server variant */

#define MSR_		MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_ISF |MSR_HV

#define MSR_KERNEL	MSR_ | MSR_64BIT

#define MSR_USER32	MSR_ | MSR_PR | MSR_EE

#define MSR_USER64	MSR_USER32 | MSR_64BIT

#define MSR_		(MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_ISF |MSR_HV)

#define MSR_KERNEL	(MSR_ | MSR_64BIT)

#define MSR_USER32	(MSR_ | MSR_PR | MSR_EE)

#define MSR_USER64	(MSR_USER32 | MSR_64BIT)

#elif defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_8xx)

/* Default MSR for kernel mode. */

#define MSR_KERNEL	(MSR_ME|MSR_RI|MSR_IR|MSR_DR)

arch/powerpc/include/asm/reg_booke.h

+4 −4
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
#if defined(CONFIG_PPC_BOOK3E_64)

#define MSR_64BIT	MSR_CM



#define MSR_		MSR_ME | MSR_CE

#define MSR_KERNEL	MSR_ | MSR_64BIT

#define MSR_USER32	MSR_ | MSR_PR | MSR_EE

#define MSR_USER64	MSR_USER32 | MSR_64BIT

#define MSR_		(MSR_ME | MSR_CE)

#define MSR_KERNEL	(MSR_ | MSR_64BIT)

#define MSR_USER32	(MSR_ | MSR_PR | MSR_EE)

#define MSR_USER64	(MSR_USER32 | MSR_64BIT)

#elif defined (CONFIG_40x)

#define MSR_KERNEL	(MSR_ME|MSR_RI|MSR_IR|MSR_DR|MSR_CE)

#define MSR_USER	(MSR_KERNEL|MSR_PR|MSR_EE)