Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00e6fa5f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' 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 (at least) powerpc due to sample_reg_masks, not being
    available for linking. (Sukadev Bhattiprolu)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a0eeb8dd 9fb47654

tools/perf/util/Build

+1 −1
Original line number Diff line number Diff line
@@ -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

tools/perf/util/perf_regs.c

+2 −0
Original line number Diff line number Diff line
@@ -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

tools/perf/util/perf_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __PERF_REGS_H



#include <linux/types.h>

#include <linux/compiler.h>



struct regs_dump;