Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / arch / sh / kernel / traps.c

diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 7b036339dc92f23a1247e6850ba23f46f4221d22..0830c2a9f712bfad77aaff2bb3a823717a567389 100644 (file)
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -58,7 +58,7 @@ BUILD_TRAP_HANDLER(debug)
        TRAP_HANDLER_DECL;
 
        /* Rewind */
-       regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
+       regs->pc -= instruction_size(__raw_readw(regs->pc - 4));
 
        if (notify_die(DIE_TRAP, "debug trap", regs, 0, vec & 0xff,
                       SIGTRAP) == NOTIFY_STOP)
@@ -75,7 +75,7 @@ BUILD_TRAP_HANDLER(bug)
        TRAP_HANDLER_DECL;
 
        /* Rewind */
-       regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
+       regs->pc -= instruction_size(__raw_readw(regs->pc - 4));
 
        if (notify_die(DIE_TRAP, "bug trap", regs, 0, TRAPA_BUG_OPCODE & 0xff,
                       SIGTRAP) == NOTIFY_STOP)