From dfe73482bb3a3131be9bb3f46783a48a75da5270 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 10 Nov 2008 13:20:23 +0100
Subject: [PATCH] --- yaml --- r: 118774 b: refs/heads/master c:
 ae99286b4f1be7788f2d6947c66a91dbd6351eec h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 86318b7b6608..88df8c4ce142 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee5f80a993539490a07477ff2526bf62c503fbb4
+refs/heads/master: ae99286b4f1be7788f2d6947c66a91dbd6351eec
diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c
index 5bbb1044f847..342fc9ccab46 100644
--- a/trunk/kernel/time/tick-sched.c
+++ b/trunk/kernel/time/tick-sched.c
@@ -568,6 +568,9 @@ static void tick_nohz_switch_to_nohz(void)
  */
 static void tick_nohz_kick_tick(int cpu)
 {
+#if 0
+	/* Switch back to 2.6.27 behaviour */
+
 	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
 	ktime_t delta, now;
 
@@ -584,6 +587,7 @@ static void tick_nohz_kick_tick(int cpu)
 		return;
 
 	tick_nohz_restart(ts, now);
+#endif
 }
 
 #else