]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Mar 2022 09:57:50 +0000 (11:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Mar 2022 09:57:50 +0000 (11:57 +0200)
added patches:
hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch

queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch [new file with mode: 0644]
queue-5.15/series

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 (file)
index 0000000..06f24da
--- /dev/null
@@ -0,0 +1,50 @@
+From 1dc2f2b81a6a9895da59f3915760f6c0c3074492 Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap@infradead.org>
+Date: Thu, 25 Nov 2021 18:33:16 -0800
+Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+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 <rdunlap@infradead.org>
+Reported-by: kernel test robot <lkp@intel.com>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: "K. Y. Srinivasan" <kys@microsoft.com>
+Cc: Haiyang Zhang <haiyangz@microsoft.com>
+Cc: Stephen Hemminger <sthemmin@microsoft.com>
+Cc: Wei Liu <wei.liu@kernel.org>
+Cc: Dexuan Cui <decui@microsoft.com>
+Cc: linux-hyperv@vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Reviewed-by: Michael Kelley <mikelley@microsoft.com>
+Link: https://lore.kernel.org/r/20211126023316.25184-1-rdunlap@infradead.org
+Signed-off-by: Wei Liu <wei.liu@kernel.org>
+Cc: Petr Štetiar <ynezz@true.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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.
index a95cefa557e003a34bd8b0d4cb6aa46e0ef25e04..61ce18e0ad347bcd9f294545a486ae303913635b 100644 (file)
@@ -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