mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
This commit is contained in:
commit
7cbbab00cb
3 changed files with 4 additions and 1 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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 @@ int perf_reg_value(u64 *valp, struct regs_dump *regs, int id)
|
||||||
*valp = regs->cache_regs[id];
|
*valp = regs->cache_regs[id];
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue