A little bit of SMP boot code cleanup

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/ia64/linux-xen/smpboot.c b/xen/arch/ia64/linux-xen/smpboot.c
index ba352809448ce7ffae0df838d82057e540d61911..8773cb617b4a1b5cdecd817aac4c43a4fb05d3fa 100644 (file)
--- a/xen/arch/ia64/linux-xen/smpboot.c
+++ b/xen/arch/ia64/linux-xen/smpboot.c
@@ -770,7 +770,7 @@ void __cpu_die(unsigned int cpu)
 #endif /* CONFIG_HOTPLUG_CPU */
 
 void
-smp_cpus_done (unsigned int dummy)
+smp_cpus_done(void)
 {
        int cpu;
        unsigned long bogosum = 0;

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index 7b053a59a5b751418f3533e4f01894ab1d6bbbee..0a9304bc2e22c597f2725039f2b7c8ec521fcab9 100644 (file)
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -615,7 +615,7 @@ printk("num_online_cpus=%d, max_cpus=%d\n",num_online_cpus(),max_cpus);
     local_irq_disable();
 
     printk("Brought up %ld CPUs\n", (long)num_online_cpus());
-    smp_cpus_done(max_cpus);
+    smp_cpus_done();
 #endif
 
     iommu_setup();    /* setup iommu if available */

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 051fd273e908a1f23820e6fedad984d388871c29..ce1cb2a46a8ff412d72f6976a4519638bc9a43a2 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1226,9 +1226,8 @@ void __init __start_xen(unsigned long mbi_p)
 
     /*
      * Initialise higher-level timer functions. We do this fairly late
-     * (post-SMP) because the time bases and scale factors need to be updated 
-     * regularly, and SMP initialisation can cause a long delay with 
-     * interrupts not yet enabled.
+     * (after interrupts got enabled) because the time bases and scale
+     * factors need to be updated regularly.
      */
     init_xen_time();
 
@@ -1254,7 +1253,7 @@ void __init __start_xen(unsigned long mbi_p)
     }
 
     printk("Brought up %ld CPUs\n", (long)num_online_cpus());
-    smp_cpus_done(max_cpus);
+    smp_cpus_done();
 
     do_initcalls();
 

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 82a78f54d5296a9945c49d501572f5d70823989b..fddf85f2fef6f272fc957e4628660a2416ee15c4 100644 (file)
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -966,7 +966,7 @@ int __cpu_up(unsigned int cpu)
 }
 
 
-void __init smp_cpus_done(unsigned int max_cpus)
+void __init smp_cpus_done(void)
 {
     /*
      * Don't taint if we are running SMP kernel on a single non-MP

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 88331e2b907f62b23c2a7e376669e3d817d6cee6..11f8c0de4eae4eb550acd5faa409d5bee76e742e 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -1445,7 +1445,7 @@ static void __init tsc_check_writability(void)
     disable_tsc_sync = 1;
 }
 
-/* Late init function (after all CPUs are booted). */
+/* Late init function (after interrupts are enabled). */
 int __init init_xen_time(void)
 {
     if ( boot_cpu_has(X86_FEATURE_TSC_RELIABLE) )

diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
index 47792b53a449175a3dc8f47b2e04b47646d56c96..0003febe804eda6a0d8042915438fe94e842280d 100644 (file)
--- a/xen/include/xen/smp.h
+++ b/xen/include/xen/smp.h
@@ -23,7 +23,7 @@ extern void smp_prepare_cpus(unsigned int max_cpus);
 /*
  * Final polishing of CPUs
  */
-extern void smp_cpus_done(unsigned int max_cpus);
+extern void smp_cpus_done(void);
 
 /*
  * Call a function on all other processors