Skip to content

Commit 18ec549

Browse files
dwmw2kuba-moo
authored andcommitted
ptp: Remove 'default y' for VMCLOCK PTP device
The VMCLOCK device gives support for accurate timekeeping even across live migration, unlike the KVM PTP clock. To help ensure that users can always use ptp_vmclock where it's available in preference to ptp_kvm, set it to 'default PTP_1588_CLOCK_VMCLOCK' instead of 'default y'. Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> Link: https://patch.msgid.link/89955b74d225129d6e3d79b53aa8d81d1b50560f.camel@infradead.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 6a7d68f commit 18ec549

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/ptp/Kconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,16 @@ config PTP_1588_CLOCK_VMCLOCK
135135
tristate "Virtual machine PTP clock"
136136
depends on X86_TSC || ARM_ARCH_TIMER
137137
depends on PTP_1588_CLOCK && ACPI && ARCH_SUPPORTS_INT128
138-
default y
138+
default PTP_1588_CLOCK_KVM
139139
help
140140
This driver adds support for using a virtual precision clock
141141
advertised by the hypervisor. This clock is only useful in virtual
142142
machines where such a device is present.
143143

144+
Unlike the KVM virtual PTP clock, the VMCLOCK device offers support
145+
for reliable timekeeping even across live migration. So this driver
146+
is enabled by default whenever the KVM PTP clock is.
147+
144148
To compile this driver as a module, choose M here: the module
145149
will be called ptp_vmclock.
146150

0 commit comments

Comments
 (0)