From 889725f315d38a213306b20050aa2e763e60418d Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 10 Aug 2011 23:21:01 +0200
Subject: [PATCH] --- yaml --- r: 372901 b: refs/heads/master c:
 ab71d36ddb9e60d4ddb28a187718815d38c3c666 h: refs/heads/master i:   372899:
 4ec1dbe71c01bcbe246f8649135983ea4d85bf02 v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/time/Kconfig | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 07e17f27da31..82d3bd2c9699 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c20091e77fc5a9b7d7d905176443b4822a23cdb
+refs/heads/master: ab71d36ddb9e60d4ddb28a187718815d38c3c666
diff --git a/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig
index 5a87c03e45ad..726c33e00da2 100644
--- a/trunk/kernel/time/Kconfig
+++ b/trunk/kernel/time/Kconfig
@@ -80,11 +80,20 @@ config NO_HZ
 	  busy and when the system is idle.
 
 config NO_HZ_EXTENDED
-       bool "Full dynticks system"
-       depends on NO_HZ && RCU_USER_QS && VIRT_CPU_ACCOUNTING_GEN && RCU_NOCB_CPU && SMP
-       select CONTEXT_TRACKING_FORCE
-       help
-         Adaptively try to shutdown the tick whenever possible, even when
+	bool "Full dynticks system"
+	# NO_HZ dependency
+	depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
+	# RCU_USER_QS
+	depends on HAVE_CONTEXT_TRACKING && SMP
+	# RCU_NOCB_CPU dependency
+	depends on TREE_RCU || TREE_PREEMPT_RCU
+	depends on VIRT_CPU_ACCOUNTING_GEN
+	select NO_HZ
+	select RCU_USER_QS
+	select RCU_NOCB_CPU
+	select CONTEXT_TRACKING_FORCE
+	help
+	 Adaptively try to shutdown the tick whenever possible, even when
 	 the CPU is running tasks. Typically this requires running a single
 	 task on the CPU. Chances for running tickless are maximized when
 	 the task mostly runs in userspace and has few kernel activity.