From 3eb5214e4bffb35495247400d9f2fd558529572a Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 17 Apr 2018 15:00:14 +0200
Subject: [PATCH] 4.4-stable patches

added patches:
	revert-perf-tests-decompress-kernel-module-before-objdump.patch
---
 ...ompress-kernel-module-before-objdump.patch | 67 +++++++++++++++++++
 queue-4.4/series                              |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 queue-4.4/revert-perf-tests-decompress-kernel-module-before-objdump.patch

diff --git a/queue-4.4/revert-perf-tests-decompress-kernel-module-before-objdump.patch b/queue-4.4/revert-perf-tests-decompress-kernel-module-before-objdump.patch
new file mode 100644
index 00000000000..e23b6196971
--- /dev/null
+++ b/queue-4.4/revert-perf-tests-decompress-kernel-module-before-objdump.patch
@@ -0,0 +1,67 @@
+From d19e5989718bb371cf20e61c3e1cbd8013e254fb Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 17 Apr 2018 14:56:21 +0200
+Subject: Revert "perf tests: Decompress kernel module before objdump"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit b0761b57e0bf11ada4c45e68f4cba1370363d90d which is
+commit 94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 upstream.
+
+It breaks the build of perf on 4.4.y, so I'm dropping it.
+
+Reported-by: Pavlos Parissis <pavlos.parissis@gmail.com>
+Reported-by: Lei Chen <chenl.lei@gmail.com>
+Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: David Ahern <dsahern@gmail.com>
+Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Cc: Wang Nan <wangnan0@huawei.com>
+Cc: kernel-team@lge.com
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/tests/code-reading.c |   20 +-------------------
+ 1 file changed, 1 insertion(+), 19 deletions(-)
+
+--- a/tools/perf/tests/code-reading.c
++++ b/tools/perf/tests/code-reading.c
+@@ -182,8 +182,6 @@ static int read_object_code(u64 addr, si
+ 	unsigned char buf2[BUFSZ];
+ 	size_t ret_len;
+ 	u64 objdump_addr;
+-	const char *objdump_name;
+-	char decomp_name[KMOD_DECOMP_LEN];
+ 	int ret;
+ 
+ 	pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr);
+@@ -244,25 +242,9 @@ static int read_object_code(u64 addr, si
+ 		state->done[state->done_cnt++] = al.map->start;
+ 	}
+ 
+-	objdump_name = al.map->dso->long_name;
+-	if (dso__needs_decompress(al.map->dso)) {
+-		if (dso__decompress_kmodule_path(al.map->dso, objdump_name,
+-						 decomp_name,
+-						 sizeof(decomp_name)) < 0) {
+-			pr_debug("decompression failed\n");
+-			return -1;
+-		}
+-
+-		objdump_name = decomp_name;
+-	}
+-
+ 	/* Read the object code using objdump */
+ 	objdump_addr = map__rip_2objdump(al.map, al.addr);
+-	ret = read_via_objdump(objdump_name, objdump_addr, buf2, len);
+-
+-	if (dso__needs_decompress(al.map->dso))
+-		unlink(objdump_name);
+-
++	ret = read_via_objdump(al.map->dso->long_name, objdump_addr, buf2, len);
+ 	if (ret > 0) {
+ 		/*
+ 		 * The kernel maps are inaccurate - assume objdump is right in
diff --git a/queue-4.4/series b/queue-4.4/series
index 23cd9513d3a..3f1e6de3ee7 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -5,3 +5,4 @@ perf-intel-pt-fix-sync_switch.patch
 perf-intel-pt-fix-error-recovery-from-missing-tip-packet.patch
 perf-intel-pt-fix-timestamp-following-overflow.patch
 radeon-hide-pointless-warning-when-compile-testing.patch
+revert-perf-tests-decompress-kernel-module-before-objdump.patch
-- 
2.47.3