aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 13:38:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 13:38:33 -0800
commit3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (patch)
tree3d01456fdd86159143ed7efb77284ae9c207c664
parent4646575daf21f544fc2f7e8d90d8c488948fcc7c (diff)
parentd7d3756c5b1277fafd132ce7a2211b388c3b5bd2 (diff)
downloadkernel_samsung_aries-3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c.zip
kernel_samsung_aries-3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c.tar.gz
kernel_samsung_aries-3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c.tar.bz2
Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: cpumask: Use modern cpumask style in Xen
-rw-r--r--arch/x86/xen/smp.c2
-rw-r--r--drivers/xen/cpu_hotplug.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index fe03eee..738da0c 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -73,7 +73,7 @@ static __cpuinit void cpu_bringup(void)
xen_setup_cpu_clockevents();
- cpu_set(cpu, cpu_online_map);
+ set_cpu_online(cpu, true);
percpu_write(cpu_state, CPU_ONLINE);
wmb();
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index bdfd584..0f765a9 100644
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -86,7 +86,7 @@ static int setup_cpu_watcher(struct notifier_block *notifier,
for_each_possible_cpu(cpu) {
if (vcpu_online(cpu) == 0) {
(void)cpu_down(cpu);
- cpu_clear(cpu, cpu_present_map);
+ set_cpu_present(cpu, false);
}
}