From 140f51ccd84ff6ebccd7affb33817bed1c186370 Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 12 Oct 2007 23:04:07 +0200
Subject: [PATCH] --- yaml --- r: 67759 b: refs/heads/master c:
 02290683343391a50f45599710295dafa2ddd018 h: refs/heads/master i:   67757:
 d85ed177a9e644b7021821548da96fe633aef761   67755:
 b1d38a66084ff1958b19f0c843d5e124aa60451e   67751:
 76c97ddaf3d23e90d5468b96a15445667584ccdb   67743:
 9e377e200b6a98799ebd4f0e3171a076b8e81b39 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/process_64.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ef9aff2f141..ac72fd2ba2fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4d58cbd158dc9b30c55c0e3881ae7c6b8843d5a
+refs/heads/master: 02290683343391a50f45599710295dafa2ddd018
diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c
index 98956555450b..6f9dbbe65eef 100644
--- a/trunk/arch/x86/kernel/process_64.c
+++ b/trunk/arch/x86/kernel/process_64.c
@@ -38,6 +38,7 @@
 #include <linux/notifier.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
+#include <linux/tick.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -208,6 +209,8 @@ void cpu_idle (void)
 			if (__get_cpu_var(cpu_idle_state))
 				__get_cpu_var(cpu_idle_state) = 0;
 
+			tick_nohz_stop_sched_tick();
+
 			rmb();
 			idle = pm_idle;
 			if (!idle)
@@ -228,6 +231,7 @@ void cpu_idle (void)
 			__exit_idle();
 		}
 
+		tick_nohz_restart_sched_tick();
 		preempt_enable_no_resched();
 		schedule();
 		preempt_disable();