projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 635942a)
powerpc/64s/paca: EX_CTR is not used with RELOCATABLE=n, remove it
authorNicholas Piggin <npiggin@gmail.com>
Sun, 21 May 2017 13:15:50 +0000 (23:15 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 20 Jun 2017 12:22:02 +0000 (22:22 +1000)
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/include/asm/exception-64s.h patch | blob | blame | history

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index f42a49a274a6cee392d6dea7fcf5371cd61664f2..9a318973af0547a6807a352663ec603305784109 100644 (file)
--- 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