| 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; |
| } |