From: Greg Kroah-Hartman Date: Tue, 29 Jan 2019 10:32:02 +0000 (+0100) Subject: quilt ref for 3.18 X-Git-Tag: v4.9.154~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7efe025490cb9425b4dec1c5c2064d997c89038b;p=thirdparty%2Fkernel%2Fstable-queue.git quilt ref for 3.18 --- diff --git a/queue-3.18/perf-unwind-take-pgoff-into-account-when-reporting-e.patch b/queue-3.18/perf-unwind-take-pgoff-into-account-when-reporting-e.patch index f27a82b9a8a..e36137e4f8d 100644 --- a/queue-3.18/perf-unwind-take-pgoff-into-account-when-reporting-e.patch +++ b/queue-3.18/perf-unwind-take-pgoff-into-account-when-reporting-e.patch @@ -169,14 +169,12 @@ Link: http://lkml.kernel.org/r/20181029141644.3907-1-milian.wolff@kdab.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- - tools/perf/util/unwind-libdw.c | 4 ++-- + tools/perf/util/unwind-libdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c -index 517c6afb2707..f4d085c38029 100644 --- a/tools/perf/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw.c -@@ -41,13 +41,13 @@ static int __report_module(struct addr_location *al, u64 ip, +@@ -41,13 +41,13 @@ static int __report_module(struct addr_l Dwarf_Addr s; dwfl_module_info(mod, NULL, &s, NULL, NULL, NULL, NULL, NULL); @@ -192,6 +190,3 @@ index 517c6afb2707..f4d085c38029 100644 false); return mod && dwfl_addrmodule(ui->dwfl, ip) == mod ? 0 : -1; --- -2.19.1 - diff --git a/queue-3.18/perf-unwind-unwind-with-libdw-doesn-t-take-symfs-int.patch b/queue-3.18/perf-unwind-unwind-with-libdw-doesn-t-take-symfs-int.patch index 83703bf3473..47db7d364de 100644 --- a/queue-3.18/perf-unwind-unwind-with-libdw-doesn-t-take-symfs-int.patch +++ b/queue-3.18/perf-unwind-unwind-with-libdw-doesn-t-take-symfs-int.patch @@ -21,14 +21,12 @@ Link: http://lkml.kernel.org/r/20180211212420.18388-1-jpmv27@aim.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- - tools/perf/util/unwind-libdw.c | 2 +- + tools/perf/util/unwind-libdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c -index dbd9954eda4a..517c6afb2707 100644 --- a/tools/perf/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw.c -@@ -47,7 +47,7 @@ static int __report_module(struct addr_location *al, u64 ip, +@@ -47,7 +47,7 @@ static int __report_module(struct addr_l if (!mod) mod = dwfl_report_elf(ui->dwfl, dso->short_name, @@ -37,6 +35,3 @@ index dbd9954eda4a..517c6afb2707 100644 false); return mod && dwfl_addrmodule(ui->dwfl, ip) == mod ? 0 : -1; --- -2.19.1 -