summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej S. Szmigiero <mail@maciej.szmigiero.name>2016-10-11 13:54:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-11 15:06:32 -0700
commitab47deb6bb03ddf1c1e253bfbbdbf5f867975ca5 (patch)
treee3f6c11da556f649a2a13ca67b44e38c9214fd67
parent54c721b857fd45f3ad3bda695ee4f472518db02a (diff)
downloadlinux-ab47deb6bb03ddf1c1e253bfbbdbf5f867975ca5.tar.gz
linux-ab47deb6bb03ddf1c1e253bfbbdbf5f867975ca5.tar.bz2
linux-ab47deb6bb03ddf1c1e253bfbbdbf5f867975ca5.zip
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>
-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
config NTP_PPS
bool "PPS kernel consumer support"
- depends on !NO_HZ
+ depends on !NO_HZ_COMMON
help
This option adds support for direct in-kernel time
synchronization using an external PPS signal.