aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMaciej S. Szmigiero <mail@maciej.szmigiero.name>2016-10-11 16:54:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-11 18:06:32 -0400
commitab47deb6bb03ddf1c1e253bfbbdbf5f867975ca5 (patch)
treee3f6c11da556f649a2a13ca67b44e38c9214fd67 /drivers
parent54c721b857fd45f3ad3bda695ee4f472518db02a (diff)
pps: kc: fix non-tickless system config dependency
CONFIG_NO_HZ currently only sets the default value of dynticks config so if PPS kernel consumer needs periodic timer ticks it should depend on !CONFIG_NO_HZ_COMMON instead of !CONFIG_NO_HZ. Otherwise it is possible to enable it even on tickless system which has CONFIG_NO_HZ not set and CONFIG_NO_HZ_IDLE (or CONFIG_NO_HZ_FULL) set. Link: http://lkml.kernel.org/r/57E2B769.50202@maciej.szmigiero.name Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Acked-by: Rodolfo Giometti <giometti@enneenne.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pps/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
index 7512e98e9311..564a51abeece 100644
--- a/drivers/pps/Kconfig
+++ b/drivers/pps/Kconfig
@@ -31,7 +31,7 @@ config PPS_DEBUG
31 31
32config NTP_PPS 32config NTP_PPS
33 bool "PPS kernel consumer support" 33 bool "PPS kernel consumer support"
34 depends on !NO_HZ 34 depends on !NO_HZ_COMMON
35 help 35 help
36 This option adds support for direct in-kernel time 36 This option adds support for direct in-kernel time
37 synchronization using an external PPS signal. 37 synchronization using an external PPS signal.