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
4 commits: a Kconfig fix for CONFIG_M8K, a warning-message printout tweak/fix, and two section fixes. This empties the x86 queue of pending 2.6.24 fixes for now. Thanks,
Ingo
------------------>
Adrian Bunk (2):
x86: revert CONFIG_X86_HT semantics change
x86: free_cache_attributes() section fix
Andrew Morton (1):
x86: arch_register_cpu() section fix
Don Zickus (1):
x86: add the word 'WARNING' in check_nmi_watchdog() output
Kconfig | 3 ++- kernel/cpu/intel_cacheinfo.c | 2 +- kernel/nmi_32.c | 3 ++- kernel/nmi_64.c | 3 ++- kernel/topology.c | 5 +++-- 5 files changed, 10 insertions(+), 6 deletions(-)
arch/x86/Kconfig +2 -1
@@ -148,7 +148,8 @@ config X86_SMP config X86_HT bool - depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8) + depends on SMP + depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8) default y config X86_BIOS_REBOOT
arch/x86/kernel/cpu/intel_cacheinfo.c +1 -1
@@ -497,7 +497,7 @@ static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index) {}static void __cpuinit cache_remove_shared_cpu_map (unsigned int cpu,int index) {}#endif -static void free_cache_attributes (unsigned int cpu) +static void __cpuinit free_cache_attributes (unsigned int cpu) {int i;
arch/x86/kernel/nmi_32.c +2 -1
@@ -106,7 +106,8 @@ static int __init check_nmi_watchdog(void)if (!per_cpu (wd_enabled, cpu))continue ;if (nmi_count (cpu) - prev_nmi_count[cpu] <=5 ) { -printk ("CPU#%d: NMI appears to be stuck (%d->%d)!\n" , +printk (KERN_WARNING "WARNING: CPU#%d: NMI " +"appears to be stuck (%d->%d)!\n" , cpu, prev_nmi_count[cpu],nmi_count (cpu));
arch/x86/kernel/nmi_64.c +2 -1
@@ -109,7 +109,8 @@ int __init check_nmi_watchdog (void)if (!per_cpu (wd_enabled, cpu))continue ;if (cpu_pda (cpu)->__nmi_count - counts[cpu] <=5 ) { -printk ("CPU#%d: NMI appears to be stuck (%d->%d)!\n" , +printk (KERN_WARNING "WARNING: CPU#%d: NMI " +"appears to be stuck (%d->%d)!\n" , cpu, counts[cpu],cpu_pda (cpu)->__nmi_count);
arch/x86/kernel/topology.c +3 -2
@@ -33,7 +33,7 @@static struct i386_cpu cpu_devices[NR_CPUS ]; -int arch_register_cpu (int num) +int __cpuinit arch_register_cpu (int num) {/* * CPU0 cannot be offlined due to several
@@ -53,7 +53,8 @@ int arch_register_cpu(int num) }#ifdef CONFIG_HOTPLUG_CPU -void arch_unregister_cpu (int num) { +void arch_unregister_cpu (int num) +{return unregister_cpu (&cpu_devices[num].cpu); }EXPORT_SYMBOL (arch_register_cpu);