[openwrt/openwrt] generic: backport 5.16 fix for hv utils build failure

LEDE Commits lede-commits at lists.infradead.org
Tue Mar 29 03:03:27 PDT 2022


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/972f2bff6add81e17728e3dd2c1f972ffa39600d

commit 972f2bff6add81e17728e3dd2c1f972ffa39600d
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Mon Mar 28 11:35:57 2022 +0200

    generic: backport 5.16 fix for hv utils build failure
    
    Backports following fix:
    
     hv: utils: add PTP_1588_CLOCK to Kconfig to fix build
    
     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'
    
    References: https://lore.kernel.org/stable/20220328093115.7486-1-ynezz@true.cz/T/#u
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 ...dd-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch b/target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch
new file mode 100644
index 0000000000..7af35ab87e
--- /dev/null
+++ b/target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch
@@ -0,0 +1,46 @@
+From fba2153a200716c1fec1eafda7356bb347589efb Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap at infradead.org>
+Date: Thu, 25 Nov 2021 18:33:16 -0800
+Subject: [PATCH] hv: utils: add PTP_1588_CLOCK to Kconfig to fix build
+
+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'
+
+References: https://lore.kernel.org/stable/20220328093115.7486-1-ynezz@true.cz/T/#u
+Fixes: 3716a49a81ba ("hv_utils: implement Hyper-V PTP source")
+Signed-off-by: Randy Dunlap <rdunlap at infradead.org>
+Reported-by: kernel test robot <lkp at intel.com>
+Cc: Arnd Bergmann <arnd at arndb.de>
+Cc: "K. Y. Srinivasan" <kys at microsoft.com>
+Cc: Haiyang Zhang <haiyangz at microsoft.com>
+Cc: Stephen Hemminger <sthemmin at microsoft.com>
+Cc: Wei Liu <wei.liu at kernel.org>
+Cc: Dexuan Cui <decui at microsoft.com>
+Cc: linux-hyperv at vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+Reviewed-by: Michael Kelley <mikelley at microsoft.com>
+Link: https://lore.kernel.org/r/20211126023316.25184-1-rdunlap@infradead.org
+Signed-off-by: Wei Liu <wei.liu at kernel.org>
+(cherry picked from commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492)
+---
+ 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.
+ 




More information about the lede-commits mailing list