aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 16:38:33 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 16:38:33 -0500
commit3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (patch)
tree3d01456fdd86159143ed7efb77284ae9c207c664 /drivers
parent4646575daf21f544fc2f7e8d90d8c488948fcc7c (diff)
parentd7d3756c5b1277fafd132ce7a2211b388c3b5bd2 (diff)
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/xen/cpu_hotplug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index bdfd584ad853..0f765a920189 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,
86 for_each_possible_cpu(cpu) { 86 for_each_possible_cpu(cpu) {
87 if (vcpu_online(cpu) == 0) { 87 if (vcpu_online(cpu) == 0) {
88 (void)cpu_down(cpu); 88 (void)cpu_down(cpu);
89 cpu_clear(cpu, cpu_present_map); 89 set_cpu_present(cpu, false);
90 } 90 }
91 } 91 }
92 92