From 30cfd3725d306cebfbc1520c6e29689064ad8b04 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 4 Nov 2011 18:58:24 +0100 Subject: hotplug-stuff.patch Do not take lock for non handled cases (might be atomic context) Signed-off-by: Thomas Gleixner --- kernel/workqueue.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'kernel') 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 */ -- cgit v1.2.3