diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 13:33:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 13:33:07 -0400 |
| commit | 90975ef71246c5c688ead04e8ff6f36dc92d28b3 (patch) | |
| tree | eda44b2efe91509719b0e62219c2efec13a9e762 /drivers/xen | |
| parent | cab4e4c43f92582a2bfc026137b3d8a175bd0360 (diff) | |
| parent | 558f6ab9106e6be701acb0257e7171df1bbccf04 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask: (36 commits)
cpumask: remove cpumask allocation from idle_balance, fix
numa, cpumask: move numa_node_id default implementation to topology.h, fix
cpumask: remove cpumask allocation from idle_balance
x86: cpumask: x86 mmio-mod.c use cpumask_var_t for downed_cpus
x86: cpumask: update 32-bit APM not to mug current->cpus_allowed
x86: microcode: cleanup
x86: cpumask: use work_on_cpu in arch/x86/kernel/microcode_core.c
cpumask: fix CONFIG_CPUMASK_OFFSTACK=y cpu hotunplug crash
numa, cpumask: move numa_node_id default implementation to topology.h
cpumask: convert node_to_cpumask_map[] to cpumask_var_t
cpumask: remove x86 cpumask_t uses.
cpumask: use cpumask_var_t in uv_flush_tlb_others.
cpumask: remove cpumask_t assignment from vector_allocation_domain()
cpumask: make Xen use the new operators.
cpumask: clean up summit's send_IPI functions
cpumask: use new cpumask functions throughout x86
x86: unify cpu_callin_mask/cpu_callout_mask/cpu_initialized_mask/cpu_sibling_setup_mask
cpumask: convert struct cpuinfo_x86's llc_shared_map to cpumask_var_t
cpumask: convert node_to_cpumask_map[] to cpumask_var_t
x86: unify 32 and 64-bit node_to_cpumask_map
...
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) |