diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-11-04 18:58:24 +0100 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-04-04 09:14:54 -0500 |
commit | 37d929f6348a3c39850e23dfe6bdb2aba2c3a130 (patch) | |
tree | 8a9ac44219ad2a8687ce63d5b63c0e379dff89a6 | |
parent | 49df4f5e5c3419ab89966f0b93ad6a5debd7adf4 (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.c | 5 |
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 */ |