diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-11-04 18:58:24 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-03-21 15:34:08 -0400 |
| commit | 6144f08ca4291dca5401d656925f8208f137e623 (patch) | |
| tree | 07694ecf683945a2160108cfe3de3572001f7050 /kernel | |
| parent | a4d8a71c7a908d9516b278947c2604cd57ce7a33 (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 c318d7bd2ef7..a08a9637f8b1 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3194,6 +3194,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 */ |