| From f1846508060abd45f057b4d9328214c0535b9d7e Mon Sep 17 00:00:00 2001 |
| From: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Date: Thu, 26 Sep 2019 14:36:48 -0300 |
| Subject: [PATCH] perf unwind: Fix libunwind build failure on i386 systems |
| |
| commit 26acf400d2dcc72c7e713e1f55db47ad92010cc2 upstream. |
| |
| Naresh Kamboju reported, that on the i386 build pr_err() |
| doesn't get defined properly due to header ordering: |
| |
| perf-in.o: In function `libunwind__x86_reg_id': |
| tools/perf/util/libunwind/../../arch/x86/util/unwind-libunwind.c:109: |
| undefined reference to `pr_err' |
| |
| Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Cc: David Ahern <dsahern@gmail.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: linux-kernel@vger.kernel.org |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/perf/arch/x86/util/unwind-libunwind.c b/tools/perf/arch/x86/util/unwind-libunwind.c |
| index 05920e3edf7a..47357973b55b 100644 |
| --- a/tools/perf/arch/x86/util/unwind-libunwind.c |
| +++ b/tools/perf/arch/x86/util/unwind-libunwind.c |
| @@ -1,11 +1,11 @@ |
| // SPDX-License-Identifier: GPL-2.0 |
| |
| #include <errno.h> |
| +#include "../../util/debug.h" |
| #ifndef REMOTE_UNWIND_LIBUNWIND |
| #include <libunwind.h> |
| #include "perf_regs.h" |
| #include "../../util/unwind.h" |
| -#include "../../util/debug.h" |
| #endif |
| |
| #ifdef HAVE_ARCH_X86_64_SUPPORT |
| -- |
| 2.7.4 |
| |
