From 1716016d59ea0dbe3aebff556fc69b20a840d00f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Mar 2022 11:57:50 +0200 Subject: [PATCH] 5.15-stable patches added patches: hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch --- ...p_1588_clock-to-kconfig-to-fix-build.patch | 50 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 51 insertions(+) create mode 100644 queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch diff --git a/queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch b/queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch new file mode 100644 index 00000000000..06f24da5a6d --- /dev/null +++ b/queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch @@ -0,0 +1,50 @@ +From 1dc2f2b81a6a9895da59f3915760f6c0c3074492 Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Thu, 25 Nov 2021 18:33:16 -0800 +Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build + +From: Randy Dunlap + +commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 upstream. + +The hyperv utilities use PTP clock interfaces and should depend a +a kconfig symbol such that they will be built as a loadable module or +builtin so that linker errors do not happen. + +Prevents these build errors: + +ld: drivers/hv/hv_util.o: in function `hv_timesync_deinit': +hv_util.c:(.text+0x37d): undefined reference to `ptp_clock_unregister' +ld: drivers/hv/hv_util.o: in function `hv_timesync_init': +hv_util.c:(.text+0x738): undefined reference to `ptp_clock_register' + +Fixes: 3716a49a81ba ("hv_utils: implement Hyper-V PTP source") +Signed-off-by: Randy Dunlap +Reported-by: kernel test robot +Cc: Arnd Bergmann +Cc: "K. Y. Srinivasan" +Cc: Haiyang Zhang +Cc: Stephen Hemminger +Cc: Wei Liu +Cc: Dexuan Cui +Cc: linux-hyperv@vger.kernel.org +Cc: Greg Kroah-Hartman +Reviewed-by: Michael Kelley +Link: https://lore.kernel.org/r/20211126023316.25184-1-rdunlap@infradead.org +Signed-off-by: Wei Liu +Cc: Petr Å tetiar +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hv/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/hv/Kconfig ++++ b/drivers/hv/Kconfig +@@ -18,6 +18,7 @@ config HYPERV_TIMER + config HYPERV_UTILS + tristate "Microsoft Hyper-V Utilities driver" + depends on HYPERV && CONNECTOR && NLS ++ depends on PTP_1588_CLOCK_OPTIONAL + help + Select this option to enable the Hyper-V Utilities. + diff --git a/queue-5.15/series b/queue-5.15/series index a95cefa557e..61ce18e0ad3 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -4,3 +4,4 @@ dt-bindings-usb-hcd-correct-usb-device-path.patch usb-serial-pl2303-fix-gs-type-detection.patch usb-serial-simple-add-nokia-phone-driver.patch mm-kfence-fix-missing-objcg-housekeeping-for-slab.patch +hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch -- 2.47.3