Make ia64 die() preempt safe
PATCH 1/1 Make ia64 die() preempt safe
Make ia64 die() preempt safe.
Signed-off-by Keith Owens <[email protected]>
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",