Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / xen / core / cpu_hotplug.c

diff --git a/drivers/xen/core/cpu_hotplug.c b/drivers/xen/core/cpu_hotplug.c
index 0969e21..f4eeedd 100644 (file)
--- a/drivers/xen/core/cpu_hotplug.c
+++ b/drivers/xen/core/cpu_hotplug.c
@@ -1,4 +1,4 @@
-#include <linux/config.h>
+
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -92,8 +92,8 @@ static int setup_cpu_watcher(struct notifier_block *notifier,
                .flags = XBWF_new_thread };
        (void)register_xenbus_watch(&cpu_watch);
 
-       if (!(xen_start_info->flags & SIF_INITDOMAIN)) {
-               for_each_cpu(i)
+       if (!is_initial_xendomain()) {
+               for_each_possible_cpu(i)
                        vcpu_hotplug(i);
                printk(KERN_INFO "Brought up %ld CPUs\n",
                       (long)num_online_cpus());
@@ -139,7 +139,7 @@ int smp_suspend(void)
                        if (err) {
                                printk(KERN_CRIT "Failed to take all CPUs "
                                       "down: %d.\n", err);
-                               for_each_cpu(i)
+                               for_each_possible_cpu(i)
                                        vcpu_hotplug(i);
                                return err;
                        }
@@ -154,12 +154,12 @@ void smp_resume(void)
 {
        int cpu;
 
-       for_each_cpu(cpu)
+       for_each_possible_cpu(cpu)
                cpu_initialize_context(cpu);
 
        unlock_cpu_hotplug();
 
-       for_each_cpu(cpu)
+       for_each_possible_cpu(cpu)
                vcpu_hotplug(cpu);
 }