x86 fixes
Linus, please pull the latest x86 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
it includes a late-breaking regression fix for die() - caught by Andrew. Thanks!
Ingo
------------------>
Ingo Molnar (1):
x86: fix die() to not be preemptible
Jason Gaston (1):
x86: intel_cacheinfo.c: cpu cache info entry for Intel Tolapai
cpu/intel_cacheinfo.c | 1 + traps_32.c | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +1 -0
@@ -49,6 +49,7 @@ static struct _cache_table cache_table[] __cpuinitdata = { 0x3c, LVL_2, 256 }, /* 4-way set assoc, sectored cache, 64 byte line size */ { 0x3d, LVL_2, 384 }, /* 6-way set assoc, sectored cache, 64 byte line size */ { 0x3e, LVL_2, 512 }, /* 4-way set assoc, sectored cache, 64 byte line size */ + { 0x3f, LVL_2, 256 }, /* 2-way set assoc, 64 byte line size */ { 0x41, LVL_2, 128 }, /* 4-way set assoc, 32 byte line size */ { 0x42, LVL_2, 256 }, /* 4-way set assoc, 32 byte line size */ { 0x43, LVL_2, 512 }, /* 4-way set assoc, 32 byte line size */
arch/x86/kernel/traps_32.c +3 -4
@@ -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;