summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-03-29 10:39:12 +0200
committerIngo Molnar <mingo@kernel.org>2016-03-29 10:39:12 +0200
commit5dc1037305140d8a7e580e916ac17df5d0124add (patch)
tree9aa6ee1d648e7394d5231350d75892798fec65cb
parenta49ac9f83b31e41c8311d64bd2b3f97a23dcb38d (diff)
parent379649cfeafef29b77d29860741f4d1c5870b65f (diff)
downloadlinux-5dc1037305140d8a7e580e916ac17df5d0124add.tar.bz2
Merge tag 'perf-urgent-for-mingo-20160328' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fix from Arnaldo Carvalho de Melo: - Fix build break on PowerPC due to missing headers with prototypes for functions defined in tools/perf/arch/powerpc/util/header.c (Sukadev Bhattiprolu) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--tools/perf/arch/powerpc/util/header.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
index 6138bdef6e63..f8ccee132867 100644
--- a/tools/perf/arch/powerpc/util/header.c
+++ b/tools/perf/arch/powerpc/util/header.c
@@ -4,6 +4,8 @@
#include <stdlib.h>
#include <string.h>
#include <linux/stringify.h>
+#include "header.h"
+#include "util.h"
#define mfspr(rn) ({unsigned long rval; \
asm volatile("mfspr %0," __stringify(rn) \