diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/xen/cpu_hotplug.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/xen/cpu_hotplug.c')
| -rw-r--r-- | drivers/xen/cpu_hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c index bdfd584ad853..0f765a920189 100644 --- a/drivers/xen/cpu_hotplug.c +++ b/drivers/xen/cpu_hotplug.c | |||
| @@ -86,7 +86,7 @@ static int setup_cpu_watcher(struct notifier_block *notifier, | |||
| 86 | for_each_possible_cpu(cpu) { | 86 | for_each_possible_cpu(cpu) { |
| 87 | if (vcpu_online(cpu) == 0) { | 87 | if (vcpu_online(cpu) == 0) { |
| 88 | (void)cpu_down(cpu); | 88 | (void)cpu_down(cpu); |
| 89 | cpu_clear(cpu, cpu_present_map); | 89 | set_cpu_present(cpu, false); |
| 90 | } | 90 | } |
| 91 | } | 91 | } |
| 92 | 92 | ||