]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2018 13:11:12 +0000 (15:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2018 13:11:12 +0000 (15:11 +0200)
added patches:
revert-perf-tools-decompress-kernel-module-when-reading-dso.patch

queue-4.9/revert-perf-tools-decompress-kernel-module-when-reading-dso.patch [new file with mode: 0644]
queue-4.9/series

diff --git a/queue-4.9/revert-perf-tools-decompress-kernel-module-when-reading-dso.patch b/queue-4.9/revert-perf-tools-decompress-kernel-module-when-reading-dso.patch
new file mode 100644 (file)
index 0000000..c1c33b2
--- /dev/null
@@ -0,0 +1,54 @@
+From 45868f28fc350562d3e9863f0d121c557095f4de Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 24 Apr 2018 15:08:40 +0200
+Subject: Revert "perf tools: Decompress kernel module when reading DSO data"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit e2d054998b151e85b6305aa72264f67097bd78e9 which is
+commit 1d6b3c9ba756a5134fd7ad1959acac776d17404b upstream.
+
+It breaks the build, so obviously none of us actually tested it :(
+
+Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
+Reported-by: Akemi Yagi <toracat@elrepo.org>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+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/util/dso.c |   16 ----------------
+ 1 file changed, 16 deletions(-)
+
+--- a/tools/perf/util/dso.c
++++ b/tools/perf/util/dso.c
+@@ -366,23 +366,7 @@ static int __open_dso(struct dso *dso, s
+       if (!is_regular_file(name))
+               return -EINVAL;
+-      if (dso__needs_decompress(dso)) {
+-              char newpath[KMOD_DECOMP_LEN];
+-              size_t len = sizeof(newpath);
+-
+-              if (dso__decompress_kmodule_path(dso, name, newpath, len) < 0) {
+-                      free(name);
+-                      return -dso->load_errno;
+-              }
+-
+-              strcpy(name, newpath);
+-      }
+-
+       fd = do_open(name);
+-
+-      if (dso__needs_decompress(dso))
+-              unlink(name);
+-
+       free(name);
+       return fd;
+ }
index 25b390db811943be5b8c75c3912d2adfcd1ffbc5..22c649822a98ab885b9dd1e1886649d73994ed79 100644 (file)
@@ -9,3 +9,4 @@ usb-musb-fix-enumeration-after-resume.patch
 usb-musb-call-pm_runtime_-get-put-_sync-before-reading-vbus-registers.patch
 usb-musb-fix-external-abort-in-musb_remove-on-omap2430.patch
 powerpc-eeh-fix-race-with-driver-un-bind.patch
+revert-perf-tools-decompress-kernel-module-when-reading-dso.patch