VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / ppc / kernel / align.c

diff --git a/arch/ppc/kernel/align.c b/arch/ppc/kernel/align.c
index 59a20f3..39f5198 100644 (file)
--- a/arch/ppc/kernel/align.c
+++ b/arch/ppc/kernel/align.c
@@ -21,7 +21,7 @@ struct aligninfo {
        unsigned char flags;
 };
 
-#if defined(CONFIG_4xx) || defined(CONFIG_POWER4)
+#if defined(CONFIG_4xx) || defined(CONFIG_POWER4) || defined(CONFIG_BOOKE)
 #define        OPCD(inst)      (((inst) & 0xFC000000) >> 26)
 #define        RS(inst)        (((inst) & 0x03E00000) >> 21)
 #define        RA(inst)        (((inst) & 0x001F0000) >> 16)
@@ -184,7 +184,7 @@ int
 fix_alignment(struct pt_regs *regs)
 {
        int instr, nb, flags;
-#if defined(CONFIG_4xx) || defined(CONFIG_POWER4)
+#if defined(CONFIG_4xx) || defined(CONFIG_POWER4) || defined(CONFIG_BOOKE)
        int opcode, f1, f2, f3;
 #endif
        int i, t;
@@ -199,8 +199,8 @@ fix_alignment(struct pt_regs *regs)
 
        CHECK_FULL_REGS(regs);
 
-#if defined(CONFIG_4xx) || defined(CONFIG_POWER4)
-       /* The 4xx-family processors have no DSISR register,
+#if defined(CONFIG_4xx) || defined(CONFIG_POWER4) || defined(CONFIG_BOOKE)
+       /* The 4xx-family & Book-E processors have no DSISR register,
         * so we emulate it.
         * The POWER4 has a DSISR register but doesn't set it on
         * an alignment fault.  -- paulus
@@ -250,7 +250,7 @@ fix_alignment(struct pt_regs *regs)
 
        flags = aligninfo[instr].flags;
 
-       /* For the 4xx-family processors, the 'dar' field of the
+       /* For the 4xx-family & Book-E processors, the 'dar' field of the
         * pt_regs structure is overloaded and is really from the DEAR.
         */