diff options
author | Siddha, Suresh B <suresh.b.siddha@intel.com> | 2006-12-06 23:34:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:28 -0500 |
commit | 112cecb2cc0e7341db92281ba04b26c41bb8146d (patch) | |
tree | 5eed4de8bfa3ed7e7f71454e82d3e92a5ee36347 | |
parent | 2d4a34c9365c6e3f94a5b26ce296e1fce9b66c8b (diff) |
[PATCH] suspend: don't change cpus_allowed for task initiating the suspend
Don't modify the cpus_allowed of the task initiating the suspend.
_cpu_down() already makes sure that the task doing the suspend doesn't run
on dying cpu.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Nigel Cunningham <nigel@suspend2.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | kernel/cpu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 272254f20d97..9124669f4586 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
@@ -270,11 +270,7 @@ int disable_nonboot_cpus(void) | |||
270 | goto out; | 270 | goto out; |
271 | } | 271 | } |
272 | } | 272 | } |
273 | error = set_cpus_allowed(current, cpumask_of_cpu(first_cpu)); | 273 | |
274 | if (error) { | ||
275 | printk(KERN_ERR "Could not run on CPU%d\n", first_cpu); | ||
276 | goto out; | ||
277 | } | ||
278 | /* We take down all of the non-boot CPUs in one shot to avoid races | 274 | /* We take down all of the non-boot CPUs in one shot to avoid races |
279 | * with the userspace trying to use the CPU hotplug at the same time | 275 | * with the userspace trying to use the CPU hotplug at the same time |
280 | */ | 276 | */ |