Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 7cbbab00cbbd · 2015-10-11T10:23:52.000-07:00
Pull perf fix from Thomas Glexiner:
 "Fix build breakage on powerpc in perf tools"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Fix build break on powerpc due to sample_reg_masks
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
@@ -17,6 +17,7 @@ libperf-y += levenshtein.o
 libperf-y += llvm-utils.o
 libperf-y += parse-options.o
 libperf-y += parse-events.o
+libperf-y += perf_regs.o
 libperf-y += path.o
 libperf-y += rbtree.o
 libperf-y += bitmap.o
@@ -103,7 +104,6 @@ libperf-$(CONFIG_LIBBABELTRACE) += data-convert-bt.o
 
 libperf-y += scripting-engines/
 
-libperf-$(CONFIG_PERF_REGS) += perf_regs.o
 libperf-$(CONFIG_ZLIB) += zlib.o
 libperf-$(CONFIG_LZMA) += lzma.o
 
diff --git a/tools/perf/util/perf_regs.c b/tools/perf/util/perf_regs.c
@@ -6,6 +6,7 @@ const struct sample_reg __weak sample_reg_masks[] = {
 	SMPL_REG_END
 };
 
+#ifdef HAVE_PERF_REGS_SUPPORT
 int perf_reg_value(u64 *valp, struct regs_dump *regs, int id)
 {
 	int i, idx = 0;
@@ -29,3 +30,4 @@ int perf_reg_value(u64 *valp, struct regs_dump *regs, int id)
 	*valp = regs->cache_regs[id];
 	return 0;
 }
+#endif
diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h
@@ -2,6 +2,7 @@
 #define __PERF_REGS_H
 
 #include <linux/types.h>
+#include <linux/compiler.h>
 
 struct regs_dump;
 

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ const struct sample_reg __weak sample_reg_masks[] = {`
`6`	`6`	`SMPL_REG_END`
`7`	`7`	`};`
`8`	`8`
	`9`	`+#ifdef HAVE_PERF_REGS_SUPPORT`
`9`	`10`	`int perf_reg_value(u64 valp, struct regs_dump regs, int id)`
`10`	`11`	`{`
`11`	`12`	`int i, idx = 0;`
`@@ -29,3 +30,4 @@ int perf_reg_value(u64 valp, struct regs_dump regs, int id)`
`29`	`30`	`*valp = regs->cache_regs[id];`
`30`	`31`	`return 0;`
`31`	`32`	`}`
	`33`	`+#endif`