diff mbox series

[41/74] backport: move backport-6.4 forward to 6.5

Message ID 20240524190907.026bded40a5d.I5dea5fdff090dacf29f0d046dabf1d8259e08405@changeid (mailing list archive)
State New, archived
Headers show
Series backport updates from Intel | expand

Commit Message

Johannes Berg May 24, 2024, 5:07 p.m. UTC 
From: Gregory Greenman <gregory.greenman@intel.com>

Move backport-6.4 to 6.5 and add some adjustments from
iwlwifi in kunit and thermal.

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 backport/backport-include/linux/thermal.h     |  6 +++++-
 backport/compat/Makefile                      |  2 +-
 .../compat/{backport-6.4.c => backport-6.5.c} | 21 +------------------
 3 files changed, 7 insertions(+), 22 deletions(-)
 rename backport/compat/{backport-6.4.c => backport-6.5.c} (65%)
diff mbox series

Patch

diff --git a/backport/backport-include/linux/thermal.h b/backport/backport-include/linux/thermal.h
index 210292509ac3..39b7ca476a3c 100644
--- a/backport/backport-include/linux/thermal.h
+++ b/backport/backport-include/linux/thermal.h
@@ -34,7 +34,11 @@  thermal_zone_device_register_with_trips(const char *type,
 #endif /* <6,0,0 */
 
 #if LINUX_VERSION_IS_LESS(6,4,0)
-void *thermal_zone_device_priv(struct thermal_zone_device *tzd);
+#define thermal_zone_device_priv LINUX_BACKPORT(thermal_zone_device_priv)
+static inline void *thermal_zone_device_priv(struct thermal_zone_device *tzd)
+{
+	return tzd->devdata;
+}
 #endif /* < 6.4.0 */
 #else /* CONFIG_THERMAL */
 #if LINUX_VERSION_IS_LESS(5,9,0)
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index d55437d70ae7..30f6180b3dea 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -17,7 +17,7 @@  compat-$(CPTCFG_KERNEL_5_11) += backport-5.11.o
 compat-$(CPTCFG_KERNEL_5_13) += backport-5.13.o
 compat-$(CPTCFG_KERNEL_5_15) += backport-5.15.o
 compat-$(CPTCFG_KERNEL_6_0) += backport-6.0.o
-compat-$(CPTCFG_KERNEL_6_4) += backport-6.4.o
+compat-$(CPTCFG_KERNEL_6_5) += backport-6.5.o
 
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/verify.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7.asn1.o
diff --git a/backport/compat/backport-6.4.c b/backport/compat/backport-6.5.c
similarity index 65%
rename from backport/compat/backport-6.4.c
rename to backport/compat/backport-6.5.c
index af872e5de04d..a27306aa6a6a 100644
--- a/backport/compat/backport-6.4.c
+++ b/backport/compat/backport-6.5.c
@@ -2,10 +2,8 @@ 
 
 #include <linux/types.h>
 #include <linux/netdevice.h>
-#include <net/dropreason.h>
-#include <linux/thermal.h>
 
-#if LINUX_VERSION_IS_GEQ(6,2,0) && defined(CONFIG_KUNIT)
+#if LINUX_VERSION_IS_GEQ(6,2,0) && IS_ENABLED(CONFIG_KUNIT)
 #include <kunit/test.h>
 
 struct kunit_auto_cleanup {
@@ -45,20 +43,3 @@  void kunit_add_cleanup(struct kunit *test, kunit_cleanup_t cleanup_func,
 }
 EXPORT_SYMBOL_GPL(kunit_add_cleanup);
 #endif /* LINUX_VERSION_IS_GEQ(6,2,0) */
-
-void drop_reasons_register_subsys(enum skb_drop_reason_subsys subsys,
-				  const struct drop_reason_list *list)
-{}
-EXPORT_SYMBOL_GPL(drop_reasons_register_subsys);
-
-void drop_reasons_unregister_subsys(enum skb_drop_reason_subsys subsys)
-{}
-EXPORT_SYMBOL_GPL(drop_reasons_unregister_subsys);
-
-#ifdef CONFIG_THERMAL
-void *thermal_zone_device_priv(struct thermal_zone_device *tzd)
-{
-	return tzd->devdata;
-}
-EXPORT_SYMBOL_GPL(thermal_zone_device_priv);
-#endif /* CONFIG_THERMAL */