Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 5 deletions

diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index a8396f36bd14..0830c2a9f712 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -9,8 +9,8 @@
 #include <asm/unwinder.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_BUG
-void handle_BUG(struct pt_regs *regs)
+#ifdef CONFIG_GENERIC_BUG
+static void handle_BUG(struct pt_regs *regs)
 {
         const struct bug_entry *bug;
         unsigned long bugaddr = regs->pc;
@@ -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,13 +75,13 @@ 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)
                 return;
 
-#ifdef CONFIG_BUG
+#ifdef CONFIG_GENERIC_BUG
         if (__kernel_text_address(instruction_pointer(regs))) {
                 insn_size_t insn = *(insn_size_t *)instruction_pointer(regs);
                 if (insn == TRAPA_BUG_OPCODE)
@@ -95,9 +95,11 @@ BUILD_TRAP_HANDLER(bug)
 
 BUILD_TRAP_HANDLER(nmi)
 {
+        unsigned int cpu = smp_processor_id();
         TRAP_HANDLER_DECL;
 
         nmi_enter();
+        nmi_count(cpu)++;
 
         switch (notify_die(DIE_NMI, "NMI", regs, 0, vec & 0xff, SIGINT)) {
         case NOTIFY_OK: