From c458df7500b756262ec486ea219f85b3e32746c4 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Fri, 4 Jun 2010 14:15:04 -0700
Subject: [PATCH] --- yaml --- r: 199823 b: refs/heads/master c:
 9e506f7adce8e6165a104d3d78fddd8ff0cdccf8 h: refs/heads/master i:   199821:
 6243583bfbd8d84ddc8aee1df6cd723354bbe1e9   199819:
 5e8a3f3f2bd7c807f52c8207c17322c2d8bf6a3c   199815:
 2e14b00246338e27cd9933b6d7092350666dde92   199807:
 9646fd7a5f590fc9f4ac1b7253520636bc9c62cf v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/softirq.c | 2 +-
 trunk/kernel/timer.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c9557e0b2576..f274b3128ffc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94b3dd0f7bb393d93e84a173b1df9b8b64c83ac4
+refs/heads/master: 9e506f7adce8e6165a104d3d78fddd8ff0cdccf8
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 825e1126008f..07b4f1b1a73a 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -850,7 +850,7 @@ static __init int spawn_ksoftirqd(void)
 	void *cpu = (void *)(long)smp_processor_id();
 	int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
 
-	BUG_ON(err == NOTIFY_BAD);
+	BUG_ON(err != NOTIFY_OK);
 	cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
 	register_cpu_notifier(&cpu_nfb);
 	return 0;
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index 2454172a80d3..ee305c8d4e18 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1717,7 +1717,7 @@ void __init init_timers(void)
 
 	init_timer_stats();
 
-	BUG_ON(err == NOTIFY_BAD);
+	BUG_ON(err != NOTIFY_OK);
 	register_cpu_notifier(&timers_nb);
 	open_softirq(TIMER_SOFTIRQ, run_timer_softirq);
 }