diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-11-04 18:58:24 +0100 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-03-13 12:40:15 -0500 |
commit | 1bd5dbdf9563842be31f2acbf23787d0c2bce237 (patch) | |
tree | bb715acefae33b00b279bf9370f4696b6e98892e /kernel | |
parent | dceba480e237afd073ad7bf7c91937cd39c934c2 (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.c | 5 |
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 */ |