lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Browse Source 
Pull perf/urgent fix from Arnaldo Carvalho de Melo:

  - Fix build break on (at least) powerpc due to sample_reg_masks, not being
    available for linking. (Sukadev Bhattiprolu)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2015-10-07 18:33:10 +02:00
parent a0eeb8dd34 9fb4765451
commit 00e6fa5fe1
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/util/Build
View File

@@ -17,6 +17,7 @@ libperf-y += levenshtein.o
libperf-y += llvm-utils.o libperf-y += llvm-utils.o
libperf-y += parse-options.o libperf-y += parse-options.o
libperf-y += parse-events.o libperf-y += parse-events.o
libperf-y += perf_regs.o
libperf-y += path.o libperf-y += path.o
libperf-y += rbtree.o libperf-y += rbtree.o
libperf-y += bitmap.o libperf-y += bitmap.o
@@ -103,7 +104,6 @@ libperf-$(CONFIG_LIBBABELTRACE) += data-convert-bt.o
libperf-y += scripting-engines/ libperf-y += scripting-engines/
libperf-$(CONFIG_PERF_REGS) += perf_regs.o
libperf-$(CONFIG_ZLIB) += zlib.o libperf-$(CONFIG_ZLIB) += zlib.o
libperf-$(CONFIG_LZMA) += lzma.o libperf-$(CONFIG_LZMA) += lzma.o

2
tools/perf/util/perf_regs.c
View File

@@ -6,6 +6,7 @@ const struct sample_reg __weak sample_reg_masks[] = {
SMPL_REG_END SMPL_REG_END
}; };
#ifdef HAVE_PERF_REGS_SUPPORT
int perf_reg_value(u64 *valp, struct regs_dump *regs, int id) int perf_reg_value(u64 *valp, struct regs_dump *regs, int id)
{ {
int i, idx = 0; int i, idx = 0;
@@ -29,3 +30,4 @@ out:
*valp = regs->cache_regs[id]; *valp = regs->cache_regs[id];
return 0; return 0;
} }
#endif

1
tools/perf/util/perf_regs.h
View File

@@ -2,6 +2,7 @@
#define __PERF_REGS_H #define __PERF_REGS_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/compiler.h>
struct regs_dump; struct regs_dump;