diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-11-04 18:58:24 +0100 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-16 13:00:33 -0600 |
| commit | f0aadf70c67a0d6ad2598bb723d2cc72a24fccdd (patch) | |
| tree | 805a53bc0091d2fc5cc46fa97c144b92c63d9f8f /kernel | |
| parent | 418f1b5d5adef104ee9ce262139797b5b0549205 (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 */ |