Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-4
+1
arch/x86/kernel/cpu/intel_cacheinfo.c
+1
arch/x86/kernel/cpu/intel_cacheinfo.c
···
49
49
{ 0x3c, LVL_2, 256 }, /* 4-way set assoc, sectored cache, 64 byte line size */
50
50
{ 0x3d, LVL_2, 384 }, /* 6-way set assoc, sectored cache, 64 byte line size */
51
51
{ 0x3e, LVL_2, 512 }, /* 4-way set assoc, sectored cache, 64 byte line size */
52
+
{ 0x3f, LVL_2, 256 }, /* 2-way set assoc, 64 byte line size */
52
53
{ 0x41, LVL_2, 128 }, /* 4-way set assoc, 32 byte line size */
53
54
{ 0x42, LVL_2, 256 }, /* 4-way set assoc, 32 byte line size */
54
55
{ 0x43, LVL_2, 512 }, /* 4-way set assoc, 32 byte line size */
+3
-4
arch/x86/kernel/traps_32.c
+3
-4
arch/x86/kernel/traps_32.c
···
373
373
374
374
if (die.lock_owner != raw_smp_processor_id()) {
375
375
console_verbose();
376
+
raw_local_irq_save(flags);
376
377
__raw_spin_lock(&die.lock);
377
-
raw_local_save_flags(flags);
378
378
die.lock_owner = smp_processor_id();
379
379
die.lock_owner_depth = 0;
380
380
bust_spinlocks(1);
381
-
}
382
-
else
383
-
raw_local_save_flags(flags);
381
+
} else
382
+
raw_local_irq_save(flags);
384
383
385
384
if (++die.lock_owner_depth < 3) {
386
385
unsigned long esp;