Commit a0bf225d 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 fixes from Arnaldo Carvalho de Melo:

. perf probe: Fix segfault due to testing the wrong pointer for NULL,
  from Ananth N Mavinakayanahalli.

. libtraceevent: Remove hard coded include to /usr/local/include in
  Makefile, which causes cross builds to include host header files,
  fix from Jack Mitchell.

. perf record: Use the right target interface for synthesizing
  threads when --cpu/-C option is used, fix from Jiri Olsa.

. Check if -DFORTIFY_SOURCE=2 is allowed, as gcc 4.7.2 defines
  it and then the build is broken when it is redefined in perf,
  fix from Marcin Slusarz.

. Fix build with NO_NEWT=1, that can happen explicitely or when
  the newt-devel package is not installed, from Michael Ellerman.

. perf/POWER7: Create a sysfs format entry for Power7 events, missing
  patch from a patchseries already merged, from Sukadev Bhattiprolu.

. Fix LIBNUMA build with glibc 2.12 and older, from Vinson Lee.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1f1b3967 d1398ccf

arch/powerpc/perf/power7-pmu.c

+13 −0
Original line number Diff line number Diff line
@@ -420,7 +420,20 @@ static struct attribute_group power7_pmu_events_group = { 
	.attrs = power7_events_attr,

};



PMU_FORMAT_ATTR(event, "config:0-19");



static struct attribute *power7_pmu_format_attr[] = {

	&format_attr_event.attr,

	NULL,

};



struct attribute_group power7_pmu_format_group = {

	.name = "format",

	.attrs = power7_pmu_format_attr,

};



static const struct attribute_group *power7_pmu_attr_groups[] = {

	&power7_pmu_format_group,

	&power7_pmu_events_group,

	NULL,

};

tools/lib/traceevent/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ export Q VERBOSE 


EVENT_PARSE_VERSION = $(EP_VERSION).$(EP_PATCHLEVEL).$(EP_EXTRAVERSION)



INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)

INCLUDES = -I. $(CONFIG_INCLUDES)



# Set compile option CFLAGS if not set elsewhere

CFLAGS ?= -g -Wall

tools/perf/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ ifeq ("$(origin DEBUG)", "command line") 
  PERF_DEBUG = $(DEBUG)

endif

ifndef PERF_DEBUG

  CFLAGS_OPTIMIZE = -O6 -D_FORTIFY_SOURCE=2

  CFLAGS_OPTIMIZE = -O6

endif



ifdef PARSER_DEBUG
@@ -180,6 +180,12 @@ ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wvolatile-register-var,-W 
       CFLAGS := $(CFLAGS) -Wvolatile-register-var

endif



ifndef PERF_DEBUG

	ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -D_FORTIFY_SOURCE=2,-D_FORTIFY_SOURCE=2),y)

		CFLAGS := $(CFLAGS) -D_FORTIFY_SOURCE=2

	endif

endif



### --- END CONFIGURATION SECTION ---



ifeq ($(srctree),)

tools/perf/bench/bench.h

+24 −0
Original line number Diff line number Diff line 
#ifndef BENCH_H

#define BENCH_H



/*

 * The madvise transparent hugepage constants were added in glibc

 * 2.13. For compatibility with older versions of glibc, define these

 * tokens if they are not already defined.

 *

 * PA-RISC uses different madvise values from other architectures and

 * needs to be special-cased.

 */

#ifdef __hppa__

# ifndef MADV_HUGEPAGE

#  define MADV_HUGEPAGE		67

# endif

# ifndef MADV_NOHUGEPAGE

#  define MADV_NOHUGEPAGE	68

# endif

#else

# ifndef MADV_HUGEPAGE

#  define MADV_HUGEPAGE		14

# endif

# ifndef MADV_NOHUGEPAGE

#  define MADV_NOHUGEPAGE	15

# endif

#endif



extern int bench_numa(int argc, const char **argv, const char *prefix);

extern int bench_sched_messaging(int argc, const char **argv, const char *prefix);

extern int bench_sched_pipe(int argc, const char **argv, const char *prefix);

tools/perf/builtin-record.c

+4 −2
Original line number Diff line number Diff line
@@ -573,13 +573,15 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) 
					 perf_event__synthesize_guest_os, tool);

	}



	if (!opts->target.system_wide)

	if (perf_target__has_task(&opts->target))

		err = perf_event__synthesize_thread_map(tool, evsel_list->threads,

						  process_synthesized_event,

						  machine);

	else

	else if (perf_target__has_cpu(&opts->target))

		err = perf_event__synthesize_threads(tool, process_synthesized_event,

					       machine);

	else /* command specified */

		err = 0;



	if (err != 0)

		goto out_delete_session;

CRA Git | Maintained and supported by SUSTech CRA and CCSE