Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (255 commits)
  [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.c
  [POWERPC] remove kernel module option for booke wdt
  [POWERPC] Avoid putting cpu node twice
  [POWERPC] Spinlock initializer cleanup
  [POWERPC] ppc4xx_sgdma needs dma-mapping.h
  [POWERPC] arch/powerpc/sysdev/timer.c build fix
  [POWERPC] get_property cleanups
  [POWERPC] Remove the unused HTDMSOUND driver
  [POWERPC] cell: cbe_cpufreq cleanup and crash fix
  [POWERPC] Declare enable_kernel_spe in a header
  [POWERPC] Add dt_xlate_addr() to bootwrapper
  [POWERPC] bootwrapper: CONFIG_ -> CONFIG_DEVICE_TREE
  [POWERPC] Don't define a custom bd_t for Xilixn Virtex based boards.
  [POWERPC] Add sane defaults for Xilinx EDK generated xparameters files
  [POWERPC] Add uartlite boot console driver for the zImage wrapper
  [POWERPC] Stop using ppc_sys for Xilinx Virtex boards
  [POWERPC] New registration for common Xilinx Virtex ppc405 platform devices
  [POWERPC] Merge common virtex header files
  [POWERPC] Rework Kconfig dependancies for Xilinx Virtex ppc405 platform
  [POWERPC] Clean up cpufreq Kconfig dependencies
  ...

1 files changed, 44 insertions, 1 deletions

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index 7e8ded051b5b..4aae0c387645 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -54,7 +54,7 @@ static int __kprobes branch_taken(unsigned int instr, struct pt_regs *regs)
  */
 int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
 {
-        unsigned int opcode, rd;
+        unsigned int opcode, rs, rb, rd, spr;
         unsigned long int imm;
 
         opcode = instr >> 26;
@@ -152,6 +152,49 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                                 regs->nip &= 0xffffffffUL;
                         return 1;
 #endif
+                case 0x26:      /* mfcr */
+                        regs->gpr[rd] = regs->ccr;
+                        regs->gpr[rd] &= 0xffffffffUL;
+                        goto mtspr_out;
+                case 0x2a6:     /* mfspr */
+                        spr = (instr >> 11) & 0x3ff;
+                        switch (spr) {
+                        case 0x20:      /* mfxer */
+                                regs->gpr[rd] = regs->xer;
+                                regs->gpr[rd] &= 0xffffffffUL;
+                                goto mtspr_out;
+                        case 0x100:     /* mflr */
+                                regs->gpr[rd] = regs->link;
+                                goto mtspr_out;
+                        case 0x120:     /* mfctr */
+                                regs->gpr[rd] = regs->ctr;
+                                goto mtspr_out;
+                        }
+                        break;
+                case 0x378:     /* orx */
+                        rs = (instr >> 21) & 0x1f;
+                        rb = (instr >> 11) & 0x1f;
+                        if (rs == rb) {         /* mr */
+                                rd = (instr >> 16) & 0x1f;
+                                regs->gpr[rd] = regs->gpr[rs];
+                                goto mtspr_out;
+                        }
+                        break;
+                case 0x3a6:     /* mtspr */
+                        spr = (instr >> 11) & 0x3ff;
+                        switch (spr) {
+                        case 0x20:      /* mtxer */
+                                regs->xer = (regs->gpr[rd] & 0xffffffffUL);
+                                goto mtspr_out;
+                        case 0x100:     /* mtlr */
+                                regs->link = regs->gpr[rd];
+                                goto mtspr_out;
+                        case 0x120:     /* mtctr */
+                                regs->ctr = regs->gpr[rd];
+mtspr_out:
+                                regs->nip += 4;
+                                return 1;
+                        }
                 }
         }
         return 0;