summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-11-04 18:58:24 +0100
committerClark Williams <williams@redhat.com>2012-04-11 11:07:50 -0500
commit8d0924980975b9872042672b0dffe4e5add5cc36 (patch)
tree30b3621b7cdedae091c4ff2ca56c6f48a7d44b48
parent1e629e1a76fd23b4fe4296381ccc56a2a4b700bc (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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index d3da5a8f7f09..bc867e8c5ca9 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3215,6 +3215,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 */