diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-30 23:03:50 -0400 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-30 23:03:50 -0400 |
| commit | 558f6ab9106e6be701acb0257e7171df1bbccf04 (patch) | |
| tree | 6e811633baeb676693c493f6c82bf785cab2771d /drivers/xen | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
| parent | 65fb0d23fcddd8697c871047b700c78817bdaa43 (diff) | |
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Conflicts:
arch/x86/include/asm/topology.h
drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/cpu_hotplug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c index 974f56d1ebe1..5f54c01c1568 100644 --- a/drivers/xen/cpu_hotplug.c +++ b/drivers/xen/cpu_hotplug.c | |||
| @@ -10,7 +10,7 @@ static void enable_hotplug_cpu(int cpu) | |||
| 10 | if (!cpu_present(cpu)) | 10 | if (!cpu_present(cpu)) |
| 11 | arch_register_cpu(cpu); | 11 | arch_register_cpu(cpu); |
| 12 | 12 | ||
| 13 | cpu_set(cpu, cpu_present_map); | 13 | set_cpu_present(cpu, true); |
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | static void disable_hotplug_cpu(int cpu) | 16 | static void disable_hotplug_cpu(int cpu) |
| @@ -18,7 +18,7 @@ static void disable_hotplug_cpu(int cpu) | |||
| 18 | if (cpu_present(cpu)) | 18 | if (cpu_present(cpu)) |
| 19 | arch_unregister_cpu(cpu); | 19 | arch_unregister_cpu(cpu); |
| 20 | 20 | ||
| 21 | cpu_clear(cpu, cpu_present_map); | 21 | set_cpu_present(cpu, false); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | static void vcpu_hotplug(unsigned int cpu) | 24 | static void vcpu_hotplug(unsigned int cpu) |