diff options
| author | <> | 2005-07-02 08:27:00 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-07 00:44:55 +0200 |
| commit | af25e94d4dcfb9608846242fabdd4e6014e5c9f0 (patch) | |
| tree | f311db4563cb7f101520c737965e3d2180fcda67 /arch/ia64/kernel/traps.c | |
| parent | Auto merge with /home/aegl/GIT/linus (diff) | |
| download | linux-af25e94d4dcfb9608846242fabdd4e6014e5c9f0.tar.xz linux-af25e94d4dcfb9608846242fabdd4e6014e5c9f0.zip | |
[IA64] Make ia64 die() preempt safe
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/traps.c')
| -rw-r--r-- | arch/ia64/kernel/traps.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index e7e520d90f03..4440c8343fa4 100644 --- a/arch/ia64/kernel/traps.c +++ b/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", |