summaryrefslogtreecommitdiffstats
path: root/meta-linaro/recipes-kernel/perf/files
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-08 22:46:13 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-08 22:46:13 +0200
commit8d89651ef729e560ad96dcfc002fcde6ff7f923b (patch)
treeeb5be01c25f735d12fe9881ee6327c9b7e8bbe39 /meta-linaro/recipes-kernel/perf/files
downloadmeta-linaro-dizzy-enea.tar.gz
initial commit for Enea Linux 5.0 armdizzy-enea
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-linaro/recipes-kernel/perf/files')
-rw-r--r--meta-linaro/recipes-kernel/perf/files/0001-perf-tools-Fix-arm64-build-error.patch42
-rw-r--r--meta-linaro/recipes-kernel/perf/files/0001-perf-tools-Fix-build-breakage-on-arm64-targets.patch45
2 files changed, 87 insertions, 0 deletions
diff --git a/meta-linaro/recipes-kernel/perf/files/0001-perf-tools-Fix-arm64-build-error.patch b/meta-linaro/recipes-kernel/perf/files/0001-perf-tools-Fix-arm64-build-error.patch
new file mode 100644
index 0000000..4a4da97
--- /dev/null
+++ b/meta-linaro/recipes-kernel/perf/files/0001-perf-tools-Fix-arm64-build-error.patch
@@ -0,0 +1,42 @@
1From 7d885749b6de2c9a1168d566e2380207b9177108 Mon Sep 17 00:00:00 2001
2From: Mark Salter <msalter@redhat.com>
3Date: Fri, 25 Jul 2014 18:02:46 -0400
4Subject: [PATCH] perf tools: Fix arm64 build error
5
6I'm seeing the following build error on arm64:
7
8 In file included from util/event.c:3:0:
9 util/event.h:95:17: error: 'PERF_REGS_MAX' undeclared here (not in a function)
10 u64 cache_regs[PERF_REGS_MAX];
11 ^
12
13This patch adds a PERF_REGS_MAX definition for arm64.
14
15Signed-off-by: Mark Salter <msalter@redhat.com>
16Acked-by: Jean Pihet <jean.pihet@linaro.org>
17Cc: Ingo Molnar <mingo@redhat.com>
18Cc: Jean Pihet <jean.pihet@linaro.org>
19Cc: Paul Mackerras <paulus@samba.org>
20Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
21Link: http://lkml.kernel.org/r/1406325766-8085-1-git-send-email-msalter@redhat.com
22Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
23---
24 tools/perf/arch/arm64/include/perf_regs.h | 2 ++
25 1 file changed, 2 insertions(+)
26
27diff --git a/tools/perf/arch/arm64/include/perf_regs.h b/tools/perf/arch/arm64/include/perf_regs.h
28index e9441b9..1d3f39c 100644
29--- a/tools/perf/arch/arm64/include/perf_regs.h
30+++ b/tools/perf/arch/arm64/include/perf_regs.h
31@@ -6,6 +6,8 @@
32 #include <asm/perf_regs.h>
33
34 #define PERF_REGS_MASK ((1ULL << PERF_REG_ARM64_MAX) - 1)
35+#define PERF_REGS_MAX PERF_REG_ARM64_MAX
36+
37 #define PERF_REG_IP PERF_REG_ARM64_PC
38 #define PERF_REG_SP PERF_REG_ARM64_SP
39
40--
412.1.3
42
diff --git a/meta-linaro/recipes-kernel/perf/files/0001-perf-tools-Fix-build-breakage-on-arm64-targets.patch b/meta-linaro/recipes-kernel/perf/files/0001-perf-tools-Fix-build-breakage-on-arm64-targets.patch
new file mode 100644
index 0000000..cb03946
--- /dev/null
+++ b/meta-linaro/recipes-kernel/perf/files/0001-perf-tools-Fix-build-breakage-on-arm64-targets.patch
@@ -0,0 +1,45 @@
1From 660d13296bbbe79635d1d9d700080b88061faffb Mon Sep 17 00:00:00 2001
2From: Will Deacon <will.deacon@arm.com>
3Date: Tue, 30 Sep 2014 12:27:12 +0100
4Subject: [PATCH] perf tools: Fix build breakage on arm64 targets
5
6Attempting to build the perf tool for an arm64 target results in the
7following failure:
8
9 arch/arm64/util/unwind-libunwind.c: In function 'libunwind__arch_reg_id':
10 arch/arm64/util/unwind-libunwind.c:77:3: error: implicit declaration of function 'pr_err'
11 pr_err("unwind: invalid reg id %d\n", regnum);
12 ^
13 arch/arm64/util/unwind-libunwind.c:77:3: error: nested extern declaration of 'pr_err'
14
15This is due to commit 84f5d36f4866 ("perf tools: Move pr_* debug macros
16into debug object") moving the pr_* macros into a new header file, but
17failing to update architectures other than x86.
18
19This patch adds the missing include, and fixes the build again.
20
21Signed-off-by: Will Deacon <will.deacon@arm.com>
22Cc: Jean Pihet <jean.pihet@linaro.org>
23Cc: Jiri Olsa <jolsa@kernel.org>
24Cc: linux-arm-kernel@lists.infradead.org
25Link: http://lkml.kernel.org/r/1412076432-22045-1-git-send-email-will.deacon@arm.com
26Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
27---
28 tools/perf/arch/arm64/util/unwind-libunwind.c | 1 +
29 1 file changed, 1 insertion(+)
30
31diff --git a/tools/perf/arch/arm64/util/unwind-libunwind.c b/tools/perf/arch/arm64/util/unwind-libunwind.c
32index 436ee43..a87afa9 100644
33--- a/tools/perf/arch/arm64/util/unwind-libunwind.c
34+++ b/tools/perf/arch/arm64/util/unwind-libunwind.c
35@@ -3,6 +3,7 @@
36 #include <libunwind.h>
37 #include "perf_regs.h"
38 #include "../../util/unwind.h"
39+#include "../../util/debug.h"
40
41 int libunwind__arch_reg_id(int regnum)
42 {
43--
442.1.3
45