summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-11-04 18:58:24 +0100
committerClark Williams <williams@redhat.com>2012-02-15 10:32:59 -0600
commit9fe725c5ec18d1314df1972e0b08ca4d039746de (patch)
treeb822ab4aaed270078e5b98d9325351c1375741ea /kernel
parent09a01e2721a5b8e5fa17772ae570ef97d5825d19 (diff)
hotplug-stuff.patch
Do not take lock for non handled cases (might be atomic context) Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index ac3a3bb3acf2..e7f3e79184dd 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3217,6 +3217,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 */