From 5d1399265239fe4783ae2d9c26d688d986f6a362 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 24 Apr 2018 15:11:12 +0200 Subject: [PATCH] 4.9-stable patches added patches: revert-perf-tools-decompress-kernel-module-when-reading-dso.patch --- ...press-kernel-module-when-reading-dso.patch | 54 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 55 insertions(+) create mode 100644 queue-4.9/revert-perf-tools-decompress-kernel-module-when-reading-dso.patch 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 index 00000000000..c1c33b25fc0 --- /dev/null +++ b/queue-4.9/revert-perf-tools-decompress-kernel-module-when-reading-dso.patch @@ -0,0 +1,54 @@ +From 45868f28fc350562d3e9863f0d121c557095f4de Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 24 Apr 2018 15:08:40 +0200 +Subject: Revert "perf tools: Decompress kernel module when reading DSO data" + +From: Greg Kroah-Hartman + +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 +Reported-by: Akemi Yagi +Cc: Namhyung Kim +Cc: Jiri Olsa +Cc: Adrian Hunter +Cc: David Ahern +Cc: Peter Zijlstra +Cc: Wang Nan +Cc: kernel-team@lge.com +Cc: Arnaldo Carvalho de Melo +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + 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; + } diff --git a/queue-4.9/series b/queue-4.9/series index 25b390db811..22c649822a9 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -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 -- 2.47.3