aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-09-10 18:47:55 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-09-10 18:47:55 -0400
commit47d846827e398af12d79e9fc4593337b9e931cab (patch)
tree7e36cc5e2a6e4e63e47397c63a390e8d8c41889a /arch/arm/Kconfig
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/arm/Kconfig')
-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
1618 ARCH_S5PV210 || ARCH_EXYNOS4 1618 ARCH_S5PV210 || ARCH_EXYNOS4
1619 default AT91_TIMER_HZ if ARCH_AT91 1619 default AT91_TIMER_HZ if ARCH_AT91
1620 default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE 1620 default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
1621 default 0
1621 1622
1622choice 1623choice
1623 depends on !HZ_FIXED 1624 depends on HZ_FIXED = 0
1624 prompt "Timer frequency" 1625 prompt "Timer frequency"
1625 1626
1626config HZ_100 1627config HZ_100
@@ -1645,7 +1646,7 @@ endchoice
1645 1646
1646config HZ 1647config HZ
1647 int 1648 int
1648 default HZ_FIXED if HZ_FIXED 1649 default HZ_FIXED if HZ_FIXED != 0
1649 default 100 if HZ_100 1650 default 100 if HZ_100
1650 default 200 if HZ_200 1651 default 200 if HZ_200
1651 default 250 if HZ_250 1652 default 250 if HZ_250