From 3a48c27c56db881289f911ffdbdf56550d97bfec Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Thu, 18 Oct 2007 03:05:12 -0700
Subject: [PATCH] --- yaml --- r: 71131 b: refs/heads/master c:
 a0d8cdb652d35af9319a9e0fb7134de2a276c636 h: refs/heads/master i:   71129:
 9056c0d7808b27cfbb5c1cffa2b36f4acc2aaa4d   71127:
 51fef7b690a7d4335fe7d45472c27d87ffa46b59 v: v3

---
 [refs]             | 2 +-
 trunk/kernel/cpu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3ef50c02463b..f0b4317f1e53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d00f6a121877235a5cacc56386936dd9bb81af
+refs/heads/master: a0d8cdb652d35af9319a9e0fb7134de2a276c636
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
index 38033db8d8ec..a21f71af9d81 100644
--- a/trunk/kernel/cpu.c
+++ b/trunk/kernel/cpu.c
@@ -150,6 +150,7 @@ static int _cpu_down(unsigned int cpu, int tasks_frozen)
 	err = __raw_notifier_call_chain(&cpu_chain, CPU_DOWN_PREPARE | mod,
 					hcpu, -1, &nr_calls);
 	if (err == NOTIFY_BAD) {
+		nr_calls--;
 		__raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED | mod,
 					  hcpu, nr_calls, NULL);
 		printk("%s: attempt to take down CPU %u failed\n",
@@ -233,6 +234,7 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen)
 	ret = __raw_notifier_call_chain(&cpu_chain, CPU_UP_PREPARE | mod, hcpu,
 							-1, &nr_calls);
 	if (ret == NOTIFY_BAD) {
+		nr_calls--;
 		printk("%s: attempt to bring up CPU %u failed\n",
 				__FUNCTION__, cpu);
 		ret = -EINVAL;