From: Nicholas Piggin Date: Sun, 21 May 2017 13:15:50 +0000 (+1000) Subject: powerpc/64s/paca: EX_CTR is not used with RELOCATABLE=n, remove it X-Git-Tag: v4.13-rc1~111^2~75 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8568f1e02624e6ce34644369e6ca137d10e32a88;p=linux.git powerpc/64s/paca: EX_CTR is not used with RELOCATABLE=n, remove it Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h index f42a49a274a6..9a318973af05 100644 --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h @@ -47,9 +47,12 @@ #define EX_CCR 52 #define EX_CFAR 56 #define EX_PPR 64 +#if defined(CONFIG_RELOCATABLE) #define EX_CTR 72 - #define EX_SIZE 10 /* size in u64 units */ +#else +#define EX_SIZE 9 /* size in u64 units */ +#endif /* * EX_LR is only used in EXSLB and where it does not overlap with EX_DAR