vserver 2.0 rc7

[linux-2.6.git] / include / asm-ppc / reg_booke.h

diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h
index 5c025f9..45c5e6f 100644 (file)
--- a/include/asm-ppc/reg_booke.h
+++ b/include/asm-ppc/reg_booke.h
@@ -172,6 +172,7 @@ do {                                                \
 #define SPRN_MAS4      0x274   /* MMU Assist Register 4 */
 #define SPRN_MAS5      0x275   /* MMU Assist Register 5 */
 #define SPRN_MAS6      0x276   /* MMU Assist Register 6 */
+#define SPRN_MAS7      0x3b0   /* MMU Assist Register 7 */
 #define SPRN_PID1      0x279   /* Process ID Register 1 */
 #define SPRN_PID2      0x27A   /* Process ID Register 2 */
 #define SPRN_TLB0CFG   0x2B0   /* TLB 0 Config Register */
@@ -304,6 +305,7 @@ do {                                                \
 #define ESR_PIL                0x08000000      /* Program Exception - Illegal */
 #define ESR_PPR                0x04000000      /* Program Exception - Priveleged */
 #define ESR_PTR                0x02000000      /* Program Exception - Trap */
+#define ESR_FP         0x01000000      /* Floating Point Operation */
 #define ESR_DST                0x00800000      /* Storage Exception - Data miss */
 #define ESR_DIZ                0x00400000      /* Storage Exception - Zone fault */
 #define ESR_ST         0x00800000      /* Store Operation */
@@ -427,26 +429,6 @@ do {                                               \
 #define SPEFSCR_FOVFE  0x00000004      /* Embedded FP overflow enable */
 #define SPEFSCR_FRMC   0x00000003      /* Embedded FP rounding mode control */
 
-/* Short-hand for various SPRs. */
-#ifdef CONFIG_BOOKE
-#define CSRR0  SPRN_CSRR0      /* Critical Save and Restore Register 0 */
-#define CSRR1  SPRN_CSRR1      /* Critical Save and Restore Register 1 */
-#else
-#define CSRR0  SPRN_SRR2       /* Logically and functionally equivalent. */
-#define CSRR1  SPRN_SRR3       /* Logically and functionally equivalent. */
-#endif
-#define MCSRR0 SPRN_MCSRR0     /* Machine Check Save and Restore Register 0 */
-#define MCSRR1 SPRN_MCSRR1     /* Machine Check Save and Restore Register 1 */
-#define DCMP   SPRN_DCMP       /* Data TLB Compare Register */
-#define SPRG4R SPRN_SPRG4R     /* Supervisor Private Registers */
-#define SPRG5R SPRN_SPRG5R
-#define SPRG6R SPRN_SPRG6R
-#define SPRG7R SPRN_SPRG7R
-#define SPRG4W SPRN_SPRG4W
-#define SPRG5W SPRN_SPRG5W
-#define SPRG6W SPRN_SPRG6W
-#define SPRG7W SPRN_SPRG7W
-
 /*
  * The IBM-403 is an even more odd special case, as it is much
  * older than the IBM-405 series.  We put these down here incase someone