From 0000b2e8c5ff4c2e69784ef7cf536aee4f730367 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Fri, 12 Apr 2013 16:40:12 +0200 Subject: [PATCH] --- yaml --- r: 372905 b: refs/heads/master c: 0644ca5c774f1a7033bfc83c7ed0660f74f28b56 h: refs/heads/master i: 372903: 06811fae58d6acb74c7253b8cb02d73698f49b45 v: v3 --- [refs] | 2 +- trunk/kernel/time/Kconfig | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fef67ec36a33..b74556504fca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1034fc2f41aaf32f782a9362178f9a236ac5a50a +refs/heads/master: 0644ca5c774f1a7033bfc83c7ed0660f74f28b56 diff --git a/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig index 27cc404ea187..cbe64be17d1f 100644 --- a/trunk/kernel/time/Kconfig +++ b/trunk/kernel/time/Kconfig @@ -75,10 +75,6 @@ config NO_HZ_COMMON depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS select TICK_ONESHOT -# Kept around for compatibility, maps to NO_HZ_IDLE -config NO_HZ - bool - choice prompt "Timer tick handling" default NO_HZ_IDLE if NO_HZ @@ -130,6 +126,14 @@ config NO_HZ_EXTENDED endchoice +config NO_HZ + bool "Old Idle dynticks config" + depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS + help + This is the old config entry that enables dynticks idle. + We keep it around for a little while to enforce backward + compatibility with older config files. + config HIGH_RES_TIMERS bool "High Resolution Timer Support" depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS