From 275dc7ed8c8df38df3e4de72ffab5551c1048260 Mon Sep 17 00:00:00 2001
From: Li Zhong <zhong@linux.vnet.ibm.com>
Date: Fri, 17 May 2013 16:44:04 +0800
Subject: [PATCH] --- yaml --- r: 377248 b: refs/heads/master c:
 1a7f829f094dd7951e7d46c571a18080e455a436 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/kernel/time/tick-sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2fdc0c45f96e..3c02e1703955 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 521921bad1192fb1b8f9b6a5aa673635848b8b5f
+refs/heads/master: 1a7f829f094dd7951e7d46c571a18080e455a436
diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c
index f4208138fbf4..0cf1c1453181 100644
--- a/trunk/kernel/time/tick-sched.c
+++ b/trunk/kernel/time/tick-sched.c
@@ -306,7 +306,7 @@ static int __cpuinit tick_nohz_cpu_down_callback(struct notifier_block *nfb,
 		 * we can't safely shutdown that CPU.
 		 */
 		if (have_nohz_full_mask && tick_do_timer_cpu == cpu)
-			return -EINVAL;
+			return NOTIFY_BAD;
 		break;
 	}
 	return NOTIFY_OK;