aboutsummaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-04-27 09:16:06 +0200
committerIngo Molnar <mingo@kernel.org>2013-04-27 09:16:06 +0200
commita1412ec539e4025831777ef78a1ce427c97bf400 (patch)
tree765d79c10c08aa7dda0b319fea48cc0c17b95ad0 /kernel/time
parent47aa8b6cbcb839efe2edaa5b50fee21df115d37b (diff)
parent8c23b80ec7f1f5405f07bb56c2f8378800ecf401 (diff)
downloadlinaro-lsk-a1412ec539e4025831777ef78a1ce427c97bf400.tar.gz
Merge branch 'timers/nohz-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/nohz
Pull more full-dynticks updates from Frederic Weisbecker: * Get rid of the passive dependency on VIRT_CPU_ACCOUNTING_GEN (finally!) * Preparation patch to remove the dependency on CONFIG_64BITS Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 1ea2bba4a68..a2ddd650cb9 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -104,11 +104,13 @@ config NO_HZ_FULL
depends on SMP
# RCU_USER_QS dependency
depends on HAVE_CONTEXT_TRACKING
- depends on VIRT_CPU_ACCOUNTING_GEN
+ # VIRT_CPU_ACCOUNTING_GEN dependency
+ depends on 64BIT
select NO_HZ_COMMON
select RCU_USER_QS
select RCU_NOCB_CPU
select RCU_NOCB_CPU_ALL
+ select VIRT_CPU_ACCOUNTING_GEN
select CONTEXT_TRACKING_FORCE
select IRQ_WORK
help