summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-11-04 18:58:24 +0100
committerClark Williams <williams@redhat.com>2012-03-24 10:27:15 -0500
commit0aa6aa3b11218ad09aab4798e0c40847cc2dc0a1 (patch)
tree8a9ac44219ad2a8687ce63d5b63c0e379dff89a6
parent68266e14b516826ea0d551fa6c6f19ee85e4f0c3 (diff)
hotplug-stuff.patch
Do not take lock for non handled cases (might be atomic context) Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/workqueue.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 8389afe59903..674d783f177b 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3219,6 +3219,11 @@ static int __devinit workqueue_cpu_up_callback(struct notifier_block *nfb,
new_worker = create_worker(gcwq, false);
if (!new_worker)
return NOTIFY_BAD;
+ case CPU_UP_CANCELED:
+ case CPU_ONLINE:
+ break;
+ default:
+ return notifier_from_errno(0);
}
/* some are called w/ irq disabled, don't disturb irq status */