Commit 3ff6a468 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4646575d d7d3756c
...@@ -73,7 +73,7 @@ static __cpuinit void cpu_bringup(void) ...@@ -73,7 +73,7 @@ static __cpuinit void cpu_bringup(void)
xen_setup_cpu_clockevents(); xen_setup_cpu_clockevents();
cpu_set(cpu, cpu_online_map); set_cpu_online(cpu, true);
percpu_write(cpu_state, CPU_ONLINE); percpu_write(cpu_state, CPU_ONLINE);
wmb(); wmb();
......
...@@ -86,7 +86,7 @@ static int setup_cpu_watcher(struct notifier_block *notifier, ...@@ -86,7 +86,7 @@ static int setup_cpu_watcher(struct notifier_block *notifier,
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
if (vcpu_online(cpu) == 0) { if (vcpu_online(cpu) == 0) {
(void)cpu_down(cpu); (void)cpu_down(cpu);
cpu_clear(cpu, cpu_present_map); set_cpu_present(cpu, false);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment