From 4340473e349056faa62794131fcb5ca807cc8099 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 8 Jun 2007 13:47:01 -0700 Subject: [PATCH] --- yaml --- r: 57479 b: refs/heads/master c: b39b70366c5be68affe9777de72846540d840464 h: refs/heads/master i: 57477: 2708af4c8d68d48ea818340a66af52b0bad0832b 57475: 516518858ab35d8b54f8833c40814fd93c3fc8cf 57471: e52d192fd95f1602bf5b6b5d72b516f65a15f6a4 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/traps.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 008ac2aff957..90116036d034 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12710a56cb56e81bd8f457cc2f50c2ebfc0cb390 +refs/heads/master: b39b70366c5be68affe9777de72846540d840464 diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c index cb29fb96948d..aac1c0be54c6 100644 --- a/trunk/arch/x86_64/kernel/traps.c +++ b/trunk/arch/x86_64/kernel/traps.c @@ -465,13 +465,14 @@ static unsigned int die_nest_count; unsigned __kprobes long oops_begin(void) { - int cpu = smp_processor_id(); + int cpu; unsigned long flags; oops_enter(); /* racy, but better than risking deadlock. */ local_irq_save(flags); + cpu = smp_processor_id(); if (!spin_trylock(&die_lock)) { if (cpu == die_owner) /* nested oops. should stop eventually */;