powerpc/64s/exception: move paca save area offsets into exception-64s.S

No generated code change.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 3585e1d7e898870fed34f5a3ced634732e4dd9ed..40d114e69cbed22e7ec4afde4cb39442a5a45d36 100644 (file)
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -36,22 +36,11 @@
  */
 #include <asm/feature-fixups.h>
 
-/* PACA save area offsets (exgen, exmc, etc) */
-#define EX_R9          0
-#define EX_R10         8
-#define EX_R11         16
-#define EX_R12         24
-#define EX_R13         32
-#define EX_DAR         40
-#define EX_DSISR       48
-#define EX_CCR         52
-#define EX_CFAR                56
-#define EX_PPR         64
+/* PACA save area size in u64 units (exgen, exmc, etc) */
 #if defined(CONFIG_RELOCATABLE)
-#define EX_CTR         72
-#define EX_SIZE                10      /* size in u64 units */
+#define EX_SIZE                10
 #else
-#define EX_SIZE                9       /* size in u64 units */
+#define EX_SIZE                9
 #endif
 
 /*

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 9b60fa040aa6fb52606cc956bf36463a146c1401..4dfccc2efc95745631cf9d8d375c909db59cfe39 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -21,6 +21,28 @@
 #include <asm/feature-fixups.h>
 #include <asm/kup.h>
 
+/* PACA save area offsets (exgen, exmc, etc) */
+#define EX_R9          0
+#define EX_R10         8
+#define EX_R11         16
+#define EX_R12         24
+#define EX_R13         32
+#define EX_DAR         40
+#define EX_DSISR       48
+#define EX_CCR         52
+#define EX_CFAR                56
+#define EX_PPR         64
+#if defined(CONFIG_RELOCATABLE)
+#define EX_CTR         72
+.if EX_SIZE != 10
+       .error "EX_SIZE is wrong"
+.endif
+#else
+.if EX_SIZE != 9
+       .error "EX_SIZE is wrong"
+.endif
+#endif
+
 /*
  * We're short on space and time in the exception prolog, so we can't
  * use the normal LOAD_REG_IMMEDIATE macro to load the address of label.