Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / arch / powerpc / lib / sstep.c

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index e79123d..9590ba7 100644 (file)
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -15,8 +15,12 @@
 
 extern char system_call_common[];
 
+#ifdef CONFIG_PPC64
 /* Bits in SRR1 that are copied from MSR */
-#define MSR_MASK       0xffffffff87c0ffff
+#define MSR_MASK       0xffffffff87c0ffffUL
+#else
+#define MSR_MASK       0x87c0ffff
+#endif
 
 /*
  * Determine whether a conditional branch instruction would branch.
@@ -66,6 +70,7 @@ int emulate_step(struct pt_regs *regs, unsigned int instr)
                if (branch_taken(instr, regs))
                        regs->nip = imm;
                return 1;
+#ifdef CONFIG_PPC64
        case 17:        /* sc */
                /*
                 * N.B. this uses knowledge about how the syscall
@@ -79,6 +84,7 @@ int emulate_step(struct pt_regs *regs, unsigned int instr)
                regs->nip = (unsigned long) &system_call_common;
                regs->msr = MSR_KERNEL;
                return 1;
+#endif
        case 18:        /* b */
                imm = instr & 0x03fffffc;
                if (imm & 0x02000000)
@@ -121,6 +127,15 @@ int emulate_step(struct pt_regs *regs, unsigned int instr)
                        if ((regs->msr & MSR_SF) == 0)
                                regs->nip &= 0xffffffffUL;
                        return 1;
+               case 0x124:     /* mtmsr */
+                       imm = regs->gpr[rd];
+                       if ((imm & MSR_RI) == 0)
+                               /* can't step mtmsr that would clear MSR_RI */
+                               return -1;
+                       regs->msr = imm;
+                       regs->nip += 4;
+                       return 1;
+#ifdef CONFIG_PPC64
                case 0x164:     /* mtmsrd */
                        /* only MSR_EE and MSR_RI get changed if bit 15 set */
                        /* mtmsrd doesn't change MSR_HV and MSR_ME */
@@ -135,6 +150,7 @@ int emulate_step(struct pt_regs *regs, unsigned int instr)
                        if ((imm & MSR_SF) == 0)
                                regs->nip &= 0xffffffffUL;
                        return 1;
+#endif
                }
        }
        return 0;