From 199c8a5c354bf9e6fe3d606be81e5fb492cad5c4 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 26 Sep 2006 10:52:36 +0200 Subject: [PATCH] --- yaml --- r: 35896 b: refs/heads/master c: abf0f10948b316b577851ef21c728341f1046552 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/traps.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d5ef89ba61bd..dc517d02233f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e07e23e1fd3000289fc7ccc6c71879070d3b19e0 +refs/heads/master: abf0f10948b316b577851ef21c728341f1046552 diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c index ffc40cff1e07..34660b1e2720 100644 --- a/trunk/arch/x86_64/kernel/traps.c +++ b/trunk/arch/x86_64/kernel/traps.c @@ -561,6 +561,8 @@ unsigned __kprobes long oops_begin(void) int cpu = safe_smp_processor_id(); unsigned long flags; + oops_enter(); + /* racy, but better than risking deadlock. */ local_irq_save(flags); if (!spin_trylock(&die_lock)) { @@ -589,6 +591,7 @@ void __kprobes oops_end(unsigned long flags) spin_unlock_irqrestore(&die_lock, flags); if (panic_on_oops) panic("Fatal exception"); + oops_exit(); } void __kprobes __die(const char * str, struct pt_regs * regs, long err)