[Xen-changelog] [xen-unstable] [LINUX] Fix build without CONFIG_HOTPLUG_CPU

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID fe2e013ae5cba1f6b7da72af7fe271a37a2a3dd1
# Parent  d2f12edc10eea829f766264c66d4e66d6d2a313a
[LINUX] Fix build without CONFIG_HOTPLUG_CPU
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/core/smpboot.c |   25 +++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff -r d2f12edc10ee -r fe2e013ae5cb 
linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c   Thu Dec 14 10:31:31 
2006 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c   Thu Dec 14 10:32:38 
2006 +0000
@@ -110,6 +110,18 @@ set_cpu_sibling_map(int cpu)
        cpu_data[cpu].booted_cores = 1;
 }
 
+static void
+remove_siblinginfo(int cpu)
+{
+       phys_proc_id[cpu] = BAD_APICID;
+       cpu_core_id[cpu]  = BAD_APICID;
+
+       cpus_clear(cpu_sibling_map[cpu]);
+       cpus_clear(cpu_core_map[cpu]);
+
+       cpu_data[cpu].booted_cores = 0;
+}
+
 static int xen_smp_intr_init(unsigned int cpu)
 {
        int rc;
@@ -358,18 +370,6 @@ static int __init initialize_cpu_present
 }
 core_initcall(initialize_cpu_present_map);
 
-static void
-remove_siblinginfo(int cpu)
-{
-       phys_proc_id[cpu] = BAD_APICID;
-       cpu_core_id[cpu]  = BAD_APICID;
-
-       cpus_clear(cpu_sibling_map[cpu]);
-       cpus_clear(cpu_core_map[cpu]);
-
-       cpu_data[cpu].booted_cores = 0;
-}
-
 int __cpu_disable(void)
 {
        cpumask_t map = cpu_online_map;
@@ -432,7 +432,6 @@ int __devinit __cpu_up(unsigned int cpu)
        /* This must be done before setting cpu_online_map */
        set_cpu_sibling_map(cpu);
        wmb();
-
 
        rc = xen_smp_intr_init(cpu);
        if (rc) {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog