diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-20 17:02:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-20 17:02:37 -0800 |
| commit | 4bde57094b3aac7c5d80fc82530db8b03c3ce2d3 (patch) | |
| tree | 5d31cd034f5e3e7701e079b6b42159c89e8a1920 /arch/x86/kernel/traps_32.c | |
| parent | 2b5baad1656d2e193308333636707ace4a2fff56 (diff) | |
| parent | 04fa11ea170afd147b5d1e1ec88ec359a766bf31 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: intel_cacheinfo.c: cpu cache info entry for Intel Tolapai
x86: fix die() to not be preemptible
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
| -rw-r--r-- | arch/x86/kernel/traps_32.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index ef601026259..c88bbffcaa0 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c @@ -373,14 +373,13 @@ void die(const char * str, struct pt_regs * regs, long err) if (die.lock_owner != raw_smp_processor_id()) { console_verbose(); + raw_local_irq_save(flags); __raw_spin_lock(&die.lock); - raw_local_save_flags(flags); die.lock_owner = smp_processor_id(); die.lock_owner_depth = 0; bust_spinlocks(1); - } - else - raw_local_save_flags(flags); + } else + raw_local_irq_save(flags); if (++die.lock_owner_depth < 3) { unsigned long esp; |