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

Commit 9b565a80 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:
 "A couple of tooling fixlets and a PMU detection printout fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix PMU detection printout when no PMU is detected
  perf symbols: Demangle cloned functions
  perf machine: Fix path unpopulated in machine__create_modules()
  perf tools: Explicitly add libdl dependency
  perf probe: Fix probing symbols with optimization suffix
  perf trace: Add mmap2 handler
  perf kmem: Make it work again on non NUMA machines
parents ddd23eb1 8a3da6c7

arch/x86/kernel/cpu/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -1506,7 +1506,7 @@ static int __init init_hw_perf_events(void) 
		err = amd_pmu_init();

		break;

	default:

		return 0;

		err = -ENOTSUPP;

	}

	if (err != 0) {

		pr_cont("no PMU driver, software events only.\n");

tools/perf/builtin-kmem.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int setup_cpunode_map(void) 


	dir1 = opendir(PATH_SYS_NODE);

	if (!dir1)

		return -1;

		return 0;



	while ((dent1 = readdir(dir1)) != NULL) {

		if (dent1->d_type != DT_DIR ||

tools/perf/builtin-trace.c

+1 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,7 @@ static int trace__replay(struct trace *trace) 


	trace->tool.sample	  = trace__process_sample;

	trace->tool.mmap	  = perf_event__process_mmap;

	trace->tool.mmap2	  = perf_event__process_mmap2;

	trace->tool.comm	  = perf_event__process_comm;

	trace->tool.exit	  = perf_event__process_exit;

	trace->tool.fork	  = perf_event__process_fork;

tools/perf/config/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ CFLAGS += -Wall 
CFLAGS += -Wextra

CFLAGS += -std=gnu99



EXTLIBS = -lelf -lpthread -lrt -lm

EXTLIBS = -lelf -lpthread -lrt -lm -ldl



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y)

  CFLAGS += -fstack-protector-all

tools/perf/util/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ static int machine__create_modules(struct machine *machine) 
		modules = path;

	}



	if (symbol__restricted_filename(path, "/proc/modules"))

	if (symbol__restricted_filename(modules, "/proc/modules"))

		return -1;



	file = fopen(modules, "r");