From e54249b7faffc4ef6c886c0a6a5e5a0f55ada2a5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Mar 2022 11:57:31 +0200 Subject: [PATCH] 5.4-stable patches added patches: hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch netdevice-add-the-case-if-dev-is-null.patch --- ...p_1588_clock-to-kconfig-to-fix-build.patch | 50 +++++++++++++++++++ ...etdevice-add-the-case-if-dev-is-null.patch | 42 ++++++++++++++++ queue-5.4/series | 2 + 3 files changed, 94 insertions(+) create mode 100644 queue-5.4/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch create mode 100644 queue-5.4/netdevice-add-the-case-if-dev-is-null.patch diff --git a/queue-5.4/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch b/queue-5.4/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch new file mode 100644 index 00000000000..be4ba941d12 --- /dev/null +++ b/queue-5.4/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 +@@ -17,6 +17,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.4/netdevice-add-the-case-if-dev-is-null.patch b/queue-5.4/netdevice-add-the-case-if-dev-is-null.patch new file mode 100644 index 00000000000..5c50a6d05e8 --- /dev/null +++ b/queue-5.4/netdevice-add-the-case-if-dev-is-null.patch @@ -0,0 +1,42 @@ +From b37a466837393af72fe8bcb8f1436410f3f173f3 Mon Sep 17 00:00:00 2001 +From: Yajun Deng +Date: Thu, 5 Aug 2021 19:54:34 +0800 +Subject: netdevice: add the case if dev is NULL + +From: Yajun Deng + +commit b37a466837393af72fe8bcb8f1436410f3f173f3 upstream. + +Add the case if dev is NULL in dev_{put, hold}, so the caller doesn't +need to care whether dev is NULL or not. + +Signed-off-by: Yajun Deng +Signed-off-by: David S. Miller +Cc: Pavel Machek +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/netdevice.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -3777,7 +3777,8 @@ void netdev_run_todo(void); + */ + static inline void dev_put(struct net_device *dev) + { +- this_cpu_dec(*dev->pcpu_refcnt); ++ if (dev) ++ this_cpu_dec(*dev->pcpu_refcnt); + } + + /** +@@ -3788,7 +3789,8 @@ static inline void dev_put(struct net_de + */ + static inline void dev_hold(struct net_device *dev) + { +- this_cpu_inc(*dev->pcpu_refcnt); ++ if (dev) ++ this_cpu_inc(*dev->pcpu_refcnt); + } + + /* Carrier loss detection, dial on demand. The functions netif_carrier_on diff --git a/queue-5.4/series b/queue-5.4/series index f9fd604929f..b3f6be98d6c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,3 +1,5 @@ swiotlb-fix-info-leak-with-dma_from_device.patch usb-serial-pl2303-add-ibm-device-ids.patch usb-serial-simple-add-nokia-phone-driver.patch +hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +netdevice-add-the-case-if-dev-is-null.patch -- 2.47.3