[patch 2.6.13-rc1] Make ia64 die() preempt safe

From: Keith Owens <kaos_at_sgi.com>
Date: 2005-07-02 16:26:49
Make ia64 die() preempt safe.

SIgned-off-by: Keith Owens <kaos@sgi.com>

Index: linux/arch/ia64/kernel/traps.c
===================================================================
--- linux.orig/arch/ia64/kernel/traps.c	2005-07-01 19:25:06.388160657 +1000
+++ linux/arch/ia64/kernel/traps.c	2005-07-01 19:25:10.413553343 +1000
@@ -90,14 +90,16 @@ die (const char *str, struct pt_regs *re
 		.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",

-
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Sat Jul 2 02:27:18 2005

This archive was generated by hypermail 2.1.8 : 2005-08-02 09:20:40 EST