Merge commit 'kumar/next' into next

[mv-sheeva.git] / arch / powerpc / kernel / traps.c

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 5ed46758f4e908f9262038d191eba288be55d485..25fc33984c2bc02d614d641a7668033ba51711bf 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -941,12 +941,15 @@ void __kprobes program_check_exception(struct pt_regs *regs)
                return;
        }
        if (reason & REASON_TRAP) {
+               /* Debugger is first in line to stop recursive faults in
+                * rcu_lock, notify_die, or atomic_notifier_call_chain */
+               if (debugger_bpt(regs))
+                       return;
+
                /* trap exception */
                if (notify_die(DIE_BPT, "breakpoint", regs, 5, 5, SIGTRAP)
                                == NOTIFY_STOP)
                        return;
-               if (debugger_bpt(regs))
-                       return;
 
                if (!(regs->msr & MSR_PR) &&  /* not user-mode */
                    report_bug(regs->nip, regs) == BUG_TRAP_TYPE_WARN) {