From d6bb0aa3b0a82cbae3f5d36888199b07802793ea Mon Sep 17 00:00:00 2001
From: unknown <unknown>
Date: Fri, 1 Jul 2005 23:27:00 -0700
Subject: [PATCH] --- yaml --- r: 4198 b: refs/heads/master c:
 af25e94d4dcfb9608846242fabdd4e6014e5c9f0 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/ia64/kernel/traps.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd5e8be851fc..ee2e97ac7054 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67d340f440f389e9d56201fb7c7aaa92f262feb1
+refs/heads/master: af25e94d4dcfb9608846242fabdd4e6014e5c9f0
diff --git a/trunk/arch/ia64/kernel/traps.c b/trunk/arch/ia64/kernel/traps.c
index e7e520d90f03..4440c8343fa4 100644
--- a/trunk/arch/ia64/kernel/traps.c
+++ b/trunk/arch/ia64/kernel/traps.c
@@ -90,14 +90,16 @@ die (const char *str, struct pt_regs *regs, long err)
 		.lock_owner_depth =	0
 	};
 	static int die_counter;
+	int cpu = get_cpu();
 
-	if (die.lock_owner != smp_processor_id()) {
+	if (die.lock_owner != cpu) {
 		console_verbose();
 		spin_lock_irq(&die.lock);
-		die.lock_owner = smp_processor_id();
+		die.lock_owner = cpu;
 		die.lock_owner_depth = 0;
 		bust_spinlocks(1);
 	}
+	put_cpu();
 
 	if (++die.lock_owner_depth < 3) {
 		printk("%s[%d]: %s %ld [%d]\n",