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

Commit 2519d3b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull perf fixes from Ingo Molnar:
 "Mostly tooling fixes, plus an Intel RAPL PMU driver fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tests x86: Fix stack map lookup in dwarf unwind test
  perf x86: Fix perf to use non-executable stack, again
  perf tools: Remove extra '/' character in events file path
  perf machine: Search for modules in %s/lib/modules/%s
  perf tests: Add static build make test
  perf tools: Fix bfd dependency libraries detection
  perf tools: Use LDFLAGS instead of ALL_LDFLAGS
  perf/x86: Fix RAPL rdmsrl_safe() usage
  tools lib traceevent: Fix memory leak in pretty_print()
  tools lib traceevent: Fix backward compatibility macros for pevent filter enums
  perf tools: Disable libdw unwind for all but x86 arch
  perf tests x86: Fix memory leak in sample_ustack()
parents f4961366 399f0c22

arch/x86/kernel/cpu/perf_event_intel_rapl.c

+2 −1
Original line number Diff line number Diff line
@@ -543,7 +543,8 @@ static int rapl_cpu_prepare(int cpu) 
	if (phys_id < 0)

		return -1;



	if (!rdmsrl_safe(MSR_RAPL_POWER_UNIT, &msr_rapl_power_unit_bits))

	/* protect rdmsrl() to handle virtualization */

	if (rdmsrl_safe(MSR_RAPL_POWER_UNIT, &msr_rapl_power_unit_bits))

		return -1;



	pmu = kzalloc_node(sizeof(*pmu), GFP_KERNEL, cpu_to_node(cpu));

tools/lib/api/fs/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
char debugfs_mountpoint[PATH_MAX + 1] = "/sys/kernel/debug";



static const char * const debugfs_known_mountpoints[] = {

	"/sys/kernel/debug/",

	"/debug/",

	"/sys/kernel/debug",

	"/debug",

	0,

};

tools/lib/traceevent/event-parse.c

+1 −0
Original line number Diff line number Diff line
@@ -4344,6 +4344,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event 
					      format, len_arg, arg);

				trace_seq_terminate(&p);

				trace_seq_puts(s, p.buffer);

				trace_seq_destroy(&p);

				arg = arg->next;

				break;

			default:

tools/lib/traceevent/event-parse.h

+2 −2
Original line number Diff line number Diff line
@@ -876,8 +876,8 @@ struct event_filter { 
struct event_filter *pevent_filter_alloc(struct pevent *pevent);



/* for backward compatibility */

#define FILTER_NONE		PEVENT_ERRNO__FILTER_NOT_FOUND

#define FILTER_NOEXIST		PEVENT_ERRNO__NO_FILTER

#define FILTER_NONE		PEVENT_ERRNO__NO_FILTER

#define FILTER_NOEXIST		PEVENT_ERRNO__FILTER_NOT_FOUND

#define FILTER_MISS		PEVENT_ERRNO__FILTER_MISS

#define FILTER_MATCH		PEVENT_ERRNO__FILTER_MATCH

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ $(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H) 
	$(QUIET_CC)$(CC) -o $@ -c -fPIC $(CFLAGS) $(GTK_CFLAGS) $<



$(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS)

	$(QUIET_LINK)$(CC) -o $@ -shared $(ALL_LDFLAGS) $(filter %.o,$^) $(GTK_LIBS)

	$(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS)



$(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \