X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fsoftirq.c;h=fa7faed77dd0445017eeabeec9cdf9f7930c8a10;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=aee8b98a4029018e4198d95f1d6488be6a44216f;hpb=c469b50b11a8eaa1dc314687c2b6030c8fdea5b7;p=linux-2.6.git

diff --git a/kernel/softirq.c b/kernel/softirq.c
index aee8b98a4..fa7faed77 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -17,6 +17,7 @@
 #include <linux/kthread.h>
 #include <linux/rcupdate.h>
 #include <linux/smp.h>
+#include <linux/vs_context.h>
 
 #include <asm/irq.h>
 /*
@@ -610,7 +611,9 @@ static struct notifier_block __cpuinitdata cpu_nfb = {
 __init int spawn_ksoftirqd(void)
 {
 	void *cpu = (void *)(long)smp_processor_id();
-	cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
+	int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
+
+	BUG_ON(err == NOTIFY_BAD);
 	cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
 	register_cpu_notifier(&cpu_nfb);
 	return 0;