Merge branch 'master' into gfs2

1 files changed, 23 insertions, 2 deletions

diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index f948419c888a..020d873b7d21 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -177,6 +177,9 @@ static void __devinit smp_store_cpu_info(int id)
          */
         if ((c->x86_vendor == X86_VENDOR_AMD) && (c->x86 == 6)) {
 
+                if (num_possible_cpus() == 1)
+                        goto valid_k7;
+
                 /* Athlon 660/661 is valid. */  
                 if ((c->x86_model==6) && ((c->x86_mask==0) || (c->x86_mask==1)))
                         goto valid_k7;
@@ -642,9 +645,13 @@ static void map_cpu_to_logical_apicid(void)
 {
         int cpu = smp_processor_id();
         int apicid = logical_smp_processor_id();
+        int node = apicid_to_node(apicid);
+
+        if (!node_online(node))
+                node = first_online_node;
 
         cpu_2_logical_apicid[cpu] = apicid;
-        map_cpu_to_node(cpu, apicid_to_node(apicid));
+        map_cpu_to_node(cpu, node);
 }
 
 static void unmap_cpu_to_logical_apicid(int cpu)
@@ -1372,7 +1379,8 @@ int __cpu_disable(void)
          */
         if (cpu == 0)
                 return -EBUSY;
-
+        if (nmi_watchdog == NMI_LOCAL_APIC)
+                stop_apic_nmi_watchdog(NULL);
         clear_local_APIC();
         /* Allow any queued timer interrupts to get serviced */
         local_irq_enable();
@@ -1486,3 +1494,16 @@ void __init smp_intr_init(void)
         /* IPI for generic function call */
         set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);
 }
+
+/*
+ * If the BIOS enumerates physical processors before logical,
+ * maxcpus=N at enumeration-time can be used to disable HT.
+ */
+static int __init parse_maxcpus(char *arg)
+{
+        extern unsigned int maxcpus;
+
+        maxcpus = simple_strtoul(arg, NULL, 0);
+        return 0;
+}
+early_param("maxcpus", parse_maxcpus);