diff mbox series

[20/30] patches: Remove unneeded 0018-pv-trace-fixes patch

Message ID 20201201220415.30582-21-hauke@hauke-m.de (mailing list archive)
State New, archived
Headers show
Series backports: Update to match kernel 5.10-rc6 | expand

Commit Message

Hauke Mehrtens Dec. 1, 2020, 10:04 p.m. UTC 
This patch is not applying any more and is only needed for kernel < 3.1
which is unsupported for some time by now.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/0018-pv-trace-fixes/INFO              |  7 --
 ...ivers_net_wireless_iwlwifi_iwl-debug.patch | 65 ---------------
 .../net_mac80211_trace.patch                  | 79 -------------------
 3 files changed, 151 deletions(-)
 delete mode 100644 patches/0018-pv-trace-fixes/INFO
 delete mode 100644 patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
 delete mode 100644 patches/0018-pv-trace-fixes/net_mac80211_trace.patch
diff mbox series

Patch

diff --git a/patches/0018-pv-trace-fixes/INFO b/patches/0018-pv-trace-fixes/INFO
deleted file mode 100644
index a2c89e92..00000000
--- a/patches/0018-pv-trace-fixes/INFO
+++ /dev/null
@@ -1,7 +0,0 @@ 
-In recent kernels, %pV will copy the va_list before using it.
-This isn't true for all kernels, so copy the va_list for use
-by the dev_*() functions, otherwise the kernel will crash if
-the message is printed and traced.
-
-This is required for kernels <= 3.1, as otherwise it would
-those kernels would crash.
diff --git a/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch b/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
deleted file mode 100644
index d323f7ad..00000000
--- a/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
+++ /dev/null
@@ -1,65 +0,0 @@ 
---- a/drivers/net/wireless/intel/iwlwifi/iwl-debug.c
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-debug.c
-@@ -69,13 +69,16 @@ void __iwl_ ##fn(struct device *dev, con
- 	struct va_format vaf = {				\
- 		.fmt = fmt,					\
- 	};							\
--	va_list args;						\
-+	va_list args1, args2;					\
- 								\
--	va_start(args, fmt);					\
--	vaf.va = &args;						\
-+	va_start(args1, fmt);					\
-+	va_copy(args2, args1);					\
-+	vaf.va = &args2;					\
- 	dev_ ##fn(dev, "%pV", &vaf);				\
-+	va_end(args2);						\
-+	vaf.va = &args1;					\
- 	trace_iwlwifi_ ##fn(&vaf);				\
--	va_end(args);						\
-+	va_end(args1);						\
- }
- 
- __iwl_fn(warn)
-@@ -94,13 +97,18 @@ void __iwl_err(struct device *dev, bool
- 	va_list args;
- 
- 	va_start(args, fmt);
--	vaf.va = &args;
- 	if (!trace_only) {
-+		va_list args2;
-+
-+		va_copy(args2, args);
-+		vaf.va = &args2;
- 		if (rfkill_prefix)
- 			dev_err(dev, "(RFKILL) %pV", &vaf);
- 		else
- 			dev_err(dev, "%pV", &vaf);
-+		va_end(args2);
- 	}
-+	vaf.va = &args;
- 	trace_iwlwifi_err(&vaf);
- 	va_end(args);
- }
-@@ -117,13 +125,19 @@ void __iwl_dbg(struct device *dev,
- 	va_list args;
- 
- 	va_start(args, fmt);
--	vaf.va = &args;
- #ifdef CONFIG_IWLWIFI_DEBUG
- 	if (iwl_have_debug_level(level) &&
--	    (!limit || net_ratelimit()))
-+	    (!limit || net_ratelimit())) {
-+		va_list args2;
-+
-+		va_copy(args2, args);
-+		vaf.va = &args2;
- 		dev_printk(KERN_DEBUG, dev, "%c %s %pV",
- 			   in_interrupt() ? 'I' : 'U', function, &vaf);
-+		va_end(args2);
-+	}
- #endif
-+	vaf.va = &args;
- 	trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);
- 	va_end(args);
- }
diff --git a/patches/0018-pv-trace-fixes/net_mac80211_trace.patch b/patches/0018-pv-trace-fixes/net_mac80211_trace.patch
deleted file mode 100644
index 8b3f7afd..00000000
--- a/patches/0018-pv-trace-fixes/net_mac80211_trace.patch
+++ /dev/null
@@ -1,79 +0,0 @@ 
---- a/net/mac80211/trace.c
-+++ b/net/mac80211/trace.c
-@@ -17,12 +17,16 @@ void __sdata_info(const char *fmt, ...)
- 	struct va_format vaf = {
- 		.fmt = fmt,
- 	};
--	va_list args;
-+	va_list args, args2;
- 
- 	va_start(args, fmt);
--	vaf.va = &args;
- 
-+	va_copy(args2, args);
-+	vaf.va = &args2;
- 	pr_info("%pV", &vaf);
-+	va_end(args2);
-+
-+	vaf.va = &args;
- 	trace_mac80211_info(&vaf);
- 	va_end(args);
- }
-@@ -35,10 +39,16 @@ void __sdata_dbg(bool print, const char
- 	va_list args;
- 
- 	va_start(args, fmt);
--	vaf.va = &args;
- 
--	if (print)
-+	if (print) {
-+		va_list args2;
-+
-+		va_copy(args2, args);
-+		vaf.va = &args2;
- 		pr_debug("%pV", &vaf);
-+		va_end(args2);
-+	}
-+	vaf.va = &args;
- 	trace_mac80211_dbg(&vaf);
- 	va_end(args);
- }
-@@ -48,12 +58,16 @@ void __sdata_err(const char *fmt, ...)
- 	struct va_format vaf = {
- 		.fmt = fmt,
- 	};
--	va_list args;
-+	va_list args, args2;
- 
- 	va_start(args, fmt);
--	vaf.va = &args;
- 
-+	va_copy(args2, args);
-+	vaf.va = &args2;
- 	pr_err("%pV", &vaf);
-+	va_end(args2);
-+
-+	vaf.va = &args;
- 	trace_mac80211_err(&vaf);
- 	va_end(args);
- }
-@@ -66,10 +80,16 @@ void __wiphy_dbg(struct wiphy *wiphy, bo
- 	va_list args;
- 
- 	va_start(args, fmt);
--	vaf.va = &args;
- 
--	if (print)
--		wiphy_dbg(wiphy, "%pV", &vaf);
-+	if (print) {
-+		va_list args2;
-+
-+		va_copy(args2, args);
-+		vaf.va = &args2;
-+		pr_debug("%pV", &vaf);
-+		va_end(args2);
-+	}
-+	vaf.va = &args;
- 	trace_mac80211_dbg(&vaf);
- 	va_end(args);
- }