Fixes for 4.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.4/series b/queue-4.4/series
index c9df19a755fd169c9ca70633860ecfd5fd513987..2af6262081fb729b25c3d6c5711506120403540e 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -2,3 +2,4 @@ asoc-intel-atom-fix-reference-to-pcm-buffer-address.patch
 i2c-dev-zero-out-array-used-for-i2c-reads-from-userspace.patch
 net-fix-memory-leak-in-ieee802154_raw_deliver.patch
 xen-events-fix-race-in-set_evtchn_to_irq.patch
+x86-tools-fix-objdump-version-check-again.patch

diff --git a/queue-4.4/x86-tools-fix-objdump-version-check-again.patch b/queue-4.4/x86-tools-fix-objdump-version-check-again.patch
new file mode 100644 (file)
index 0000000..6532722
--- /dev/null
+++ b/queue-4.4/x86-tools-fix-objdump-version-check-again.patch
@@ -0,0 +1,42 @@
+From 4168415e9548c11874d38ecf38cc3e1bbe4a1f65 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 30 Jul 2021 17:01:46 -0700
+Subject: x86/tools: Fix objdump version check again
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+[ Upstream commit 839ad22f755132838f406751439363c07272ad87 ]
+
+Skip (omit) any version string info that is parenthesized.
+
+Warning: objdump version 15) is older than 2.19
+Warning: Skipping posttest.
+
+where 'objdump -v' says:
+GNU objdump (GNU Binutils; SUSE Linux Enterprise 15) 2.35.1.20201123-7.18
+
+Fixes: 8bee738bb1979 ("x86: Fix objdump version check in chkobjdump.awk for different formats.")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
+Link: https://lore.kernel.org/r/20210731000146.2720-1-rdunlap@infradead.org
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/x86/tools/chkobjdump.awk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/x86/tools/chkobjdump.awk b/arch/x86/tools/chkobjdump.awk
+index fd1ab80be0de..a4cf678cf5c8 100644
+--- a/arch/x86/tools/chkobjdump.awk
++++ b/arch/x86/tools/chkobjdump.awk
+@@ -10,6 +10,7 @@ BEGIN {
+ 
+ /^GNU objdump/ {
+       verstr = ""
++      gsub(/\(.*\)/, "");
+       for (i = 3; i <= NF; i++)
+               if (match($(i), "^[0-9]")) {
+                       verstr = $(i);
+-- 
+2.30.2
+