diff options
| author | Colin Cross <ccross@android.com> | 2012-08-15 22:10:50 +0200 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-08-20 17:35:46 +0100 |
| commit | 2c39435458e6d5a42c2508c9f64e607d964a8a61 (patch) | |
| tree | 5be15e00eff07737d4a05f2552a90cfb7981f33c | |
| parent | 5ecbc3b037bbaa7b827158d0a61cf9c926e11111 (diff) | |
cpuidle: coupled: fix sleeping while atomic in cpu notifiertracking-tracking-armlt-misc-fixes-ll-20120903.0tracking-tracking-armlt-misc-fixes-ll-20120827.0tracking-tracking-armlt-misc-fixes-ll-20120823.1tracking-tracking-armlt-misc-fixes-ll-20120823.0tracking-tracking-armlt-misc-fixes-ll-20120822.0tracking-tracking-armlt-misc-fixes-ll-20120820.1
The cpu hotplug notifier gets called in both atomic and non-atomic
contexts, it is not always safe to lock a mutex. Filter out all events
except the six necessary ones, which are all sleepable, before taking
the mutex.
Signed-off-by: Colin Cross <ccross@android.com>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
| -rw-r--r-- | drivers/cpuidle/coupled.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c index c78a5ff5c3c5..3265844839bf 100644 --- a/drivers/cpuidle/coupled.c +++ b/drivers/cpuidle/coupled.c @@ -678,6 +678,18 @@ static int cpuidle_coupled_cpu_notify(struct notifier_block *nb, int cpu = (unsigned long)hcpu; struct cpuidle_device *dev; + switch (action & ~CPU_TASKS_FROZEN) { + case CPU_UP_PREPARE: + case CPU_DOWN_PREPARE: + case CPU_ONLINE: + case CPU_DEAD: + case CPU_UP_CANCELED: + case CPU_DOWN_FAILED: + break; + default: + return NOTIFY_OK; + } + mutex_lock(&cpuidle_lock); dev = per_cpu(cpuidle_devices, cpu); |