diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 16:38:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 16:38:33 -0500 |
| commit | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (patch) | |
| tree | 3d01456fdd86159143ed7efb77284ae9c207c664 /arch/x86 | |
| parent | 4646575daf21f544fc2f7e8d90d8c488948fcc7c (diff) | |
| parent | d7d3756c5b1277fafd132ce7a2211b388c3b5bd2 (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 'arch/x86')
| -rw-r--r-- | arch/x86/xen/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index fe03eeed7b48..738da0cb0d8b 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
| @@ -73,7 +73,7 @@ static __cpuinit void cpu_bringup(void) | |||
| 73 | 73 | ||
| 74 | xen_setup_cpu_clockevents(); | 74 | xen_setup_cpu_clockevents(); |
| 75 | 75 | ||
| 76 | cpu_set(cpu, cpu_online_map); | 76 | set_cpu_online(cpu, true); |
| 77 | percpu_write(cpu_state, CPU_ONLINE); | 77 | percpu_write(cpu_state, CPU_ONLINE); |
| 78 | wmb(); | 78 | wmb(); |
| 79 | 79 | ||