summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-09-10 23:47:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-09-10 23:47:55 +0100
commit47d846827e398af12d79e9fc4593337b9e931cab (patch)
tree7e36cc5e2a6e4e63e47397c63a390e8d8c41889a /arch
parent9319206d712a5462b93870c38144a7c9a452d392 (diff)
ARM: fix forced-HZ values
Olof Johansson reports that the tests against HZ_FIXED seem non-functional. Fix this by using '0' as a sentinel for "not specified" and test against that instead. Reported-by: Olof Johansson <olof@lixom.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a00f4c1c7d71..026b1217d3b9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1618,9 +1618,10 @@ config HZ_FIXED
ARCH_S5PV210 || ARCH_EXYNOS4
default AT91_TIMER_HZ if ARCH_AT91
default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
+ default 0
choice
- depends on !HZ_FIXED
+ depends on HZ_FIXED = 0
prompt "Timer frequency"
config HZ_100
@@ -1645,7 +1646,7 @@ endchoice
config HZ
int
- default HZ_FIXED if HZ_FIXED
+ default HZ_FIXED if HZ_FIXED != 0
default 100 if HZ_100
default 200 if HZ_200
default 250 if HZ_250