Commit a3aaabd6 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 98f20fb6 da54becc
...@@ -148,7 +148,8 @@ config X86_SMP ...@@ -148,7 +148,8 @@ config X86_SMP
config X86_HT config X86_HT
bool 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 default y
config X86_BIOS_REBOOT config X86_BIOS_REBOOT
......
...@@ -497,7 +497,7 @@ static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index) {} ...@@ -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) {} static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index) {}
#endif #endif
static void free_cache_attributes(unsigned int cpu) static void __cpuinit free_cache_attributes(unsigned int cpu)
{ {
int i; int i;
......
...@@ -106,7 +106,8 @@ static int __init check_nmi_watchdog(void) ...@@ -106,7 +106,8 @@ static int __init check_nmi_watchdog(void)
if (!per_cpu(wd_enabled, cpu)) if (!per_cpu(wd_enabled, cpu))
continue; continue;
if (nmi_count(cpu) - prev_nmi_count[cpu] <= 5) { 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, cpu,
prev_nmi_count[cpu], prev_nmi_count[cpu],
nmi_count(cpu)); nmi_count(cpu));
......
...@@ -109,7 +109,8 @@ int __init check_nmi_watchdog (void) ...@@ -109,7 +109,8 @@ int __init check_nmi_watchdog (void)
if (!per_cpu(wd_enabled, cpu)) if (!per_cpu(wd_enabled, cpu))
continue; continue;
if (cpu_pda(cpu)->__nmi_count - counts[cpu] <= 5) { 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, cpu,
counts[cpu], counts[cpu],
cpu_pda(cpu)->__nmi_count); cpu_pda(cpu)->__nmi_count);
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
static struct i386_cpu cpu_devices[NR_CPUS]; 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 * CPU0 cannot be offlined due to several
...@@ -53,7 +53,8 @@ int arch_register_cpu(int num) ...@@ -53,7 +53,8 @@ int arch_register_cpu(int num)
} }
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
void arch_unregister_cpu(int num) { void arch_unregister_cpu(int num)
{
return unregister_cpu(&cpu_devices[num].cpu); return unregister_cpu(&cpu_devices[num].cpu);
} }
EXPORT_SYMBOL(arch_register_cpu); EXPORT_SYMBOL(arch_register_cpu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment