powerpc: Cleanup definition of the PID register

Move SPRN_PID declearations in various locations into one place.

Signed-off-by: Tseng-Hui (Frank) Lin <thlin@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 125fc1a..bd0d36e 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -170,6 +170,16 @@
 #define SPEFSCR_FRMC   0x00000003      /* Embedded FP rounding mode control */
 
 /* Special Purpose Registers (SPRNs)*/
+
+#ifdef CONFIG_40x
+#define SPRN_PID       0x3B1   /* Process ID */
+#else
+#define SPRN_PID       0x030   /* Process ID */
+#ifdef CONFIG_BOOKE
+#define SPRN_PID0      SPRN_PID/* Process ID Register 0 */
+#endif
+#endif
+
 #define SPRN_CTR       0x009   /* Count Register */
 #define SPRN_DSCR      0x11
 #define SPRN_CTRLF     0x088

diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index e68c69b..86ad812 100644 (file)
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -150,8 +150,6 @@
  * or IBM 40x.
  */
 #ifdef CONFIG_BOOKE
-#define SPRN_PID       0x030   /* Process ID */
-#define SPRN_PID0      SPRN_PID/* Process ID Register 0 */
 #define SPRN_CSRR0     0x03A   /* Critical Save and Restore Register 0 */
 #define SPRN_CSRR1     0x03B   /* Critical Save and Restore Register 1 */
 #define SPRN_DEAR      0x03D   /* Data Error Address Register */
@@ -168,7 +166,6 @@
 #define SPRN_TCR       0x154   /* Timer Control Register */
 #endif /* Book E */
 #ifdef CONFIG_40x
-#define SPRN_PID       0x3B1   /* Process ID */
 #define SPRN_DBCR1     0x3BD   /* Debug Control Register 1 */          
 #define SPRN_ESR       0x3D4   /* Exception Syndrome Register */
 #define SPRN_DEAR      0x3D5   /* Data Error Address Register */