diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-20 14:59:50 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-20 14:59:50 -0400 |
| commit | 44e8ba93cf330f075178e31759100f367313790a (patch) | |
| tree | 27956beb159bfb603d672b43cb207690a087dd0a /kernel/sched/core.c | |
| parent | e9fe8a714e450b26f76eaf8832f5b9fe24d00e79 (diff) | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
Merge commit 'v3.3' into fbdev-next
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 33a0676ea744..b342f57879e6 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
| @@ -6728,7 +6728,7 @@ int __init sched_create_sysfs_power_savings_entries(struct device *dev) | |||
| 6728 | static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action, | 6728 | static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action, |
| 6729 | void *hcpu) | 6729 | void *hcpu) |
| 6730 | { | 6730 | { |
| 6731 | switch (action) { | 6731 | switch (action & ~CPU_TASKS_FROZEN) { |
| 6732 | case CPU_ONLINE: | 6732 | case CPU_ONLINE: |
| 6733 | case CPU_DOWN_FAILED: | 6733 | case CPU_DOWN_FAILED: |
| 6734 | cpuset_update_active_cpus(); | 6734 | cpuset_update_active_cpus(); |
| @@ -6741,7 +6741,7 @@ static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action, | |||
| 6741 | static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action, | 6741 | static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action, |
| 6742 | void *hcpu) | 6742 | void *hcpu) |
| 6743 | { | 6743 | { |
| 6744 | switch (action) { | 6744 | switch (action & ~CPU_TASKS_FROZEN) { |
| 6745 | case CPU_DOWN_PREPARE: | 6745 | case CPU_DOWN_PREPARE: |
| 6746 | cpuset_update_active_cpus(); | 6746 | cpuset_update_active_cpus(); |
| 6747 | return NOTIFY_OK; | 6747 | return NOTIFY_OK; |