openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2009-12-08 13:38:33 -08:00
parent 4646575daf d7d3756c5b
commit 3ff6a468b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/xen/smp.c
View File

@ -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();

2
drivers/xen/cpu_hotplug.c
View File

@ -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);
} }
} }