From a114bc58b57d6834a4a02990d36a56b3ac2c3b2b Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Sun, 9 Nov 2008 12:45:10 -0800
Subject: [PATCH] --- yaml --- r: 118628 b: refs/heads/master c:
 9a6558371bcd01c2973b7638181db4ccc34eab4f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/cpuidle/cpuidle.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5a1585286c76..2626be4e48b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f1e94031f5891e8b375e5ff5d48672c250be353
+refs/heads/master: 9a6558371bcd01c2973b7638181db4ccc34eab4f
diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c
index 5bed73329ef8..8504a2108557 100644
--- a/trunk/drivers/cpuidle/cpuidle.c
+++ b/trunk/drivers/cpuidle/cpuidle.c
@@ -65,12 +65,14 @@ static void cpuidle_idle_call(void)
 		return;
 	}
 
+#if 0
+	/* shows regressions, re-enable for 2.6.29 */
 	/*
 	 * run any timers that can be run now, at this point
 	 * before calculating the idle duration etc.
 	 */
 	hrtimer_peek_ahead_timers();
-
+#endif
 	/* ask the governor for the next state */
 	next_state = cpuidle_curr_governor->select(dev);
 	if (need_resched())