---

yaml --- r: 118774 b: refs/heads/master c: ae99286 h: refs/heads/master v: v3
git-mirror · Nov 10, 2008 · dfe7348 · dfe7348
1 parent ced7e7c
commit dfe7348
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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