[PATCH] cpu hotplug: fix CPU_UP_CANCEL handling

[linux-2.6] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 336f92d64e2ec04bb56d7146a4fc1e1eeb1141f5..9e2f1c6e73d7b341958c74baa8af54169c88c119 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -470,6 +470,8 @@ static int cpu_callback(struct notifier_block *nfb,
                break;
 #ifdef CONFIG_HOTPLUG_CPU
        case CPU_UP_CANCELED:
+               if (!per_cpu(ksoftirqd, hotcpu))
+                       break;
                /* Unbind so it can run.  Fall thru. */
                kthread_bind(per_cpu(ksoftirqd, hotcpu),
                             any_online_cpu(cpu_online_map));