aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2014-09-23 08:04:48 +0200
committerAndrey Konovalov <andrey.konovalov@linaro.org>2014-09-30 14:52:47 +0400
commit96b15a6580a3d4e60ed0722f31c36f55dacaf921 (patch)
treedf33026902370d34d5b66b14c5e24eedc226757d
parentfe82dcec644244676d55a1384c958d5f67979adb (diff)
Fix perf build failure on arm/arm64 architectures introduced by commit 84f5d36f4 (move pr_* debug macros into debug object): arch/arm/util/unwind-libunwind.c: In function 'libunwind__arch_reg_id': arch/arm/util/unwind-libunwind.c:43:3: error: implicit declaration of function 'pr_err' [-Werror=implicit-function-declaration] pr_err("unwind: invalid reg id %d\n", regnum); ^ arch/arm/util/unwind-libunwind.c:43:3: error: nested extern declaration of 'pr_err' [-Werror=nested-externs] cc1: all warnings being treated as errors make[2]: *** [arch/arm/util/unwind-libunwind.o] Error 1 arch/arm/tests/dwarf-unwind.c: In function 'sample_ustack': arch/arm/tests/dwarf-unwind.c:20:3: error: implicit declaration of function 'pr_debug' [-Werror=implicit-function-declaration] pr_debug("failed to allocate sample uregs data\n"); ^ arch/arm/tests/dwarf-unwind.c:20:3: error: nested extern declaration of 'pr_debug' [-Werror=nested-externs] cc1: all warnings being treated as errors make[2]: *** [arch/arm/tests/dwarf-unwind.o] Error 1 Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rw-r--r--tools/perf/arch/arm/tests/dwarf-unwind.c1
-rw-r--r--tools/perf/arch/arm/util/unwind-libunwind.c1
-rw-r--r--tools/perf/arch/arm64/util/unwind-libunwind.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/arch/arm/tests/dwarf-unwind.c b/tools/perf/arch/arm/tests/dwarf-unwind.c
index 9f870d27cb39..62eff847f91c 100644
--- a/tools/perf/arch/arm/tests/dwarf-unwind.c
+++ b/tools/perf/arch/arm/tests/dwarf-unwind.c
@@ -3,6 +3,7 @@
#include "thread.h"
#include "map.h"
#include "event.h"
+#include "debug.h"
#include "tests/tests.h"
#define STACK_SIZE 8192
diff --git a/tools/perf/arch/arm/util/unwind-libunwind.c b/tools/perf/arch/arm/util/unwind-libunwind.c
index 729ed69a6664..62c397ed3d97 100644
--- a/tools/perf/arch/arm/util/unwind-libunwind.c
+++ b/tools/perf/arch/arm/util/unwind-libunwind.c
@@ -3,6 +3,7 @@
#include <libunwind.h>
#include "perf_regs.h"
#include "../../util/unwind.h"
+#include "../../util/debug.h"
int libunwind__arch_reg_id(int regnum)
{
diff --git a/tools/perf/arch/arm64/util/unwind-libunwind.c b/tools/perf/arch/arm64/util/unwind-libunwind.c
index 436ee43859dc..a87afa91a99e 100644
--- a/tools/perf/arch/arm64/util/unwind-libunwind.c
+++ b/tools/perf/arch/arm64/util/unwind-libunwind.c
@@ -3,6 +3,7 @@
#include <libunwind.h>
#include "perf_regs.h"
#include "../../util/unwind.h"
+#include "../../util/debug.h"
int libunwind__arch_reg_id(int regnum)
{