From e81e77c5a055d1cbf6d6a6f0acbaf443267aa84f Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 10 Oct 2021 15:20:45 +0300
Subject: [PATCH] Enable PPS_SYNC on amd64, arm64 and armv7

Remove the option from NOTES/LINT, and add to NOTES for powerpc and
riscv.

PR:	259036
Requested by:	John Hay <john@sanren.ac.za>
Discussed with:	ian, imp
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
---
 sys/amd64/conf/GENERIC   | 6 ++++++
 sys/arm/conf/std.armv7   | 6 ++++++
 sys/arm64/conf/std.arm64 | 6 ++++++
 sys/conf/NOTES           | 6 ------
 sys/powerpc/conf/NOTES   | 2 ++
 sys/riscv/conf/NOTES     | 2 ++
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 40c14e90aef..f47b995beb2 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -138,6 +138,12 @@ options		PCI_IOV			# PCI SR-IOV support
 
 options 	COMPAT_LINUXKPI
 
+# Enable support for the kernel PLL to use an external PPS signal,
+# under supervision of [x]ntpd(8)
+# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
+
+options 	PPS_SYNC
+
 # Floppy drives
 device		fdc
 
diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7
index 2d1dfa13578..fda291df289 100644
--- a/sys/arm/conf/std.armv7
+++ b/sys/arm/conf/std.armv7
@@ -84,3 +84,9 @@ options 	VERBOSE_SYSINIT=0	# Support debug.verbose_sysinit, off by default
 #options 	KTR_VERBOSE=0
 #options 	USB_REQ_DEBUG
 #options 	USB_VERBOSE
+
+# Enable support for the kernel PLL to use an external PPS signal,
+# under supervision of [x]ntpd(8)
+# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
+
+options 	PPS_SYNC
diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64
index 8460d449939..5c26f19b429 100644
--- a/sys/arm64/conf/std.arm64
+++ b/sys/arm64/conf/std.arm64
@@ -96,3 +96,9 @@ options 	NETDUMP			# netdump(4) client support
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
+
+# Enable support for the kernel PLL to use an external PPS signal,
+# under supervision of [x]ntpd(8)
+# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
+
+options 	PPS_SYNC
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 39446fba06b..e41b00edf2f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1245,12 +1245,6 @@ options 	CAPABILITY_MODE	# sandboxes with no global namespace access
 
 options 	HZ=100
 
-# Enable support for the kernel PLL to use an external PPS signal,
-# under supervision of [x]ntpd(8)
-# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
-
-options 	PPS_SYNC
-
 # Enable support for generic feed-forward clocks in the kernel.
 # The feed-forward clock support is an alternative to the feedback oriented
 # ntpd/system clock approach, and is to be used with a feed-forward
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 78d990331ea..1a0c70fb08f 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -46,6 +46,8 @@ options 	PSIM			#GDB PSIM ppc simulator
 options 	MAMBO			#IBM Mambo Full System Simulator
 options		QEMU			#QEMU processor emulator
 
+options 	PPS_SYNC
+
 # The cpufreq(4) driver provides support for CPU frequency control
 device		cpufreq
 
diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES
index 7dda89bfe1a..60e842ab270 100644
--- a/sys/riscv/conf/NOTES
+++ b/sys/riscv/conf/NOTES
@@ -20,6 +20,8 @@ options 	FPE			# Floating-point extension support
 options 	RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
 options 	INTRNG			# Include INTRNG framework
 
+options 	PPS_SYNC
+
 # RISC-V SBI console
 device		rcons