aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-04 12:28:45 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-04 12:28:45 -0500
commita3aaabd6b402d8b0ede5aa4a040e9fdbbfdf9116 (patch)
treefeee65cf5a52fb2be7d2dc48a412b0f3a8b93a05
parent98f20fb6a9b1db4ef6ab19e5eb0e41f04d38b4aa (diff)
parentda54becc7166b5fad70538acea5e93bdd83dd8a6 (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: arch_register_cpu() section fix x86: free_cache_attributes() section fix x86: add the word 'WARNING' in check_nmi_watchdog() output x86: revert CONFIG_X86_HT semantics change
-rw-r--r--arch/x86/Kconfig3
-rw-r--r--arch/x86/kernel/cpu/intel_cacheinfo.c2
-rw-r--r--arch/x86/kernel/nmi_32.c3
-rw-r--r--arch/x86/kernel/nmi_64.c3
-rw-r--r--arch/x86/kernel/topology.c5
5 files changed, 10 insertions, 6 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 368864dfe6eb..391cb1894127 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -148,7 +148,8 @@ config X86_SMP
148 148
149config X86_HT 149config X86_HT
150 bool 150 bool
151 depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8) 151 depends on SMP
152 depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8)
152 default y 153 default y
153 154
154config X86_BIOS_REBOOT 155config X86_BIOS_REBOOT
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 9921b01fe199..606fe4d55a91 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -497,7 +497,7 @@ static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index) {}
497static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index) {} 497static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index) {}
498#endif 498#endif
499 499
500static void free_cache_attributes(unsigned int cpu) 500static void __cpuinit free_cache_attributes(unsigned int cpu)
501{ 501{
502 int i; 502 int i;
503 503
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index f5cc47c60b13..80ca72e5ac29 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -106,7 +106,8 @@ static int __init check_nmi_watchdog(void)
106 if (!per_cpu(wd_enabled, cpu)) 106 if (!per_cpu(wd_enabled, cpu))
107 continue; 107 continue;
108 if (nmi_count(cpu) - prev_nmi_count[cpu] <= 5) { 108 if (nmi_count(cpu) - prev_nmi_count[cpu] <= 5) {
109 printk("CPU#%d: NMI appears to be stuck (%d->%d)!\n", 109 printk(KERN_WARNING "WARNING: CPU#%d: NMI "
110 "appears to be stuck (%d->%d)!\n",
110 cpu, 111 cpu,
111 prev_nmi_count[cpu], 112 prev_nmi_count[cpu],
112 nmi_count(cpu)); 113 nmi_count(cpu));
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index a576fd740062..4253c4e8849c 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -109,7 +109,8 @@ int __init check_nmi_watchdog (void)
109 if (!per_cpu(wd_enabled, cpu)) 109 if (!per_cpu(wd_enabled, cpu))
110 continue; 110 continue;
111 if (cpu_pda(cpu)->__nmi_count - counts[cpu] <= 5) { 111 if (cpu_pda(cpu)->__nmi_count - counts[cpu] <= 5) {
112 printk("CPU#%d: NMI appears to be stuck (%d->%d)!\n", 112 printk(KERN_WARNING "WARNING: CPU#%d: NMI "
113 "appears to be stuck (%d->%d)!\n",
113 cpu, 114 cpu,
114 counts[cpu], 115 counts[cpu],
115 cpu_pda(cpu)->__nmi_count); 116 cpu_pda(cpu)->__nmi_count);
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index 8caa0b777466..7e16d675eb85 100644
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -33,7 +33,7 @@
33 33
34static struct i386_cpu cpu_devices[NR_CPUS]; 34static struct i386_cpu cpu_devices[NR_CPUS];
35 35
36int arch_register_cpu(int num) 36int __cpuinit arch_register_cpu(int num)
37{ 37{
38 /* 38 /*
39 * CPU0 cannot be offlined due to several 39 * CPU0 cannot be offlined due to several
@@ -53,7 +53,8 @@ int arch_register_cpu(int num)
53} 53}
54 54
55#ifdef CONFIG_HOTPLUG_CPU 55#ifdef CONFIG_HOTPLUG_CPU
56void arch_unregister_cpu(int num) { 56void arch_unregister_cpu(int num)
57{
57 return unregister_cpu(&cpu_devices[num].cpu); 58 return unregister_cpu(&cpu_devices[num].cpu);
58} 59}
59EXPORT_SYMBOL(arch_register_cpu); 60EXPORT_SYMBOL(arch_register_cpu);