Merge branches 'perf/powerpc' and 'perf/bench' into perf/core

Merge reason: Both 'perf bench' and the pending PowerPC changes
              are now ready for the next merge window.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/powerpc/kernel/entry_64.S
Simple merge

diff --cc arch/powerpc/kernel/perf_event.c
Simple merge

diff --cc arch/powerpc/kernel/time.c
Simple merge

diff --cc include/linux/perf_counter.h
Simple merge

diff --cc include/linux/perf_event.h
index ec3768a810584f28c1706f5968558461e4a8f9b6,a33707a3a78882135b0b1c5d82faa18fa1f79a3b,45b56faf5cdc439f883e03eb39bc4abaf4852aae..df4e73e33774354d0b68666e3bdc176f69530190
--- 1/include/linux/perf_event.h
--- 2/include/linux/perf_event.h
--- 3/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@@@ -219,9 -221,8 -219,9 +221,9 @@@@ struct perf_event_attr 
   #define PERF_EVENT_IOC_DISABLE               _IO ('$', 1)
   #define PERF_EVENT_IOC_REFRESH               _IO ('$', 2)
   #define PERF_EVENT_IOC_RESET         _IO ('$', 3)
 --#define PERF_EVENT_IOC_PERIOD                _IOW('$', 4, u64)
 ++#define PERF_EVENT_IOC_PERIOD                _IOW('$', 4, __u64)
   #define PERF_EVENT_IOC_SET_OUTPUT    _IO ('$', 5)
 + #define PERF_EVENT_IOC_SET_FILTER    _IOW('$', 6, char *)
   
   enum perf_event_ioc_flags {
        PERF_IOC_FLAG_GROUP             = 1U << 0,

diff --cc kernel/perf_event.c
Simple merge

diff --cc tools/perf/Makefile
index e6d42728a33a81d5a563713cfeea39590116ecf3,742a32eee8fc6180f8c2ad070b53731aaca8bdfd,0a2542844a625e1880246883f88f1896d3eb49dc..f7cd89622cf486e9b46e03e8e423e7a3428a39d7
--- 1/tools/perf/Makefile
--- 2/tools/perf/Makefile
--- 3/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@@@ -200,14 -201,7 -200,14 +200,14 @@@@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wo
   EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes
   EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wdeclaration-after-statement
   
 - CFLAGS = $(MBITS) -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -fstack-protector-all -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS)
 + ifeq ("$(origin DEBUG)", "command line")
 +   PERF_DEBUG = $(DEBUG)
 + endif
 + ifndef PERF_DEBUG
 +   CFLAGS_OPTIMIZE = -O6
 + endif
 + 
  -CFLAGS = $(MBITS) -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -fstack-protector-all -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS)
 ++CFLAGS = $(MBITS) -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS)
   LDFLAGS = -lpthread -lrt -lelf -lm
   ALL_CFLAGS = $(CFLAGS)
   ALL_LDFLAGS = $(LDFLAGS)
@@@@ -337,27 -328,8 -334,26 +337,27 @@@@ LIB_FILE=libperf.
   LIB_H += ../../include/linux/perf_event.h
   LIB_H += ../../include/linux/rbtree.h
   LIB_H += ../../include/linux/list.h
 + LIB_H += util/include/linux/bitmap.h
 + LIB_H += util/include/linux/bitops.h
 + LIB_H += util/include/linux/compiler.h
 + LIB_H += util/include/linux/ctype.h
 + LIB_H += util/include/linux/kernel.h
   LIB_H += util/include/linux/list.h
 + LIB_H += util/include/linux/module.h
 + LIB_H += util/include/linux/poison.h
 + LIB_H += util/include/linux/prefetch.h
 + LIB_H += util/include/linux/rbtree.h
 + LIB_H += util/include/linux/string.h
 + LIB_H += util/include/linux/types.h
 + LIB_H += util/include/asm/asm-offsets.h
 + LIB_H += util/include/asm/bitops.h
 + LIB_H += util/include/asm/byteorder.h
 + LIB_H += util/include/asm/swab.h
 + LIB_H += util/include/asm/system.h
 + LIB_H += util/include/asm/uaccess.h
   LIB_H += perf.h
 ++LIB_H += util/debugfs.h
 + LIB_H += util/event.h
   LIB_H += util/types.h
   LIB_H += util/levenshtein.h
   LIB_H += util/parse-options.h
@@@@ -382,9 -351,7 -378,8 +382,9 @@@@ LIB_OBJS += util/abspath.
   LIB_OBJS += util/alias.o
   LIB_OBJS += util/config.o
   LIB_OBJS += util/ctype.o
 ++LIB_OBJS += util/debugfs.o
   LIB_OBJS += util/environment.o
 + LIB_OBJS += util/event.o
   LIB_OBJS += util/exec_cmd.o
   LIB_OBJS += util/help.o
   LIB_OBJS += util/levenshtein.o
@@@@ -416,11 -381,8 -411,18 +416,18 @@@@ LIB_OBJS += util/trace-event-parse.
   LIB_OBJS += util/trace-event-read.o
   LIB_OBJS += util/trace-event-info.o
   LIB_OBJS += util/svghelper.o
 + LIB_OBJS += util/sort.o
 + LIB_OBJS += util/hist.o
 + LIB_OBJS += util/data_map.o
   
   BUILTIN_OBJS += builtin-annotate.o
++ 
++ BUILTIN_OBJS += builtin-bench.o
++ 
++ # Benchmark modules
++ BUILTIN_OBJS += bench/sched-messaging.o
++ BUILTIN_OBJS += bench/sched-pipe.o
++ 
   BUILTIN_OBJS += builtin-help.o
   BUILTIN_OBJS += builtin-sched.o
   BUILTIN_OBJS += builtin-list.o

diff --cc tools/perf/perf.c
Simple merge

diff --cc tools/perf/util/parse-events.c
index 097938a96d74b5813f040394d7f178ac5f153438,34bd844239337fbf8bdef4e41969d960ee1a0503,31baa5a60365b01ad0d49225f55e2e28e7d1693c..0faf4f2bb5caaa2c39177009fb26fbf69873bdfa
--- 1/tools/perf/util/parse-events.c
--- 2/tools/perf/util/parse-events.c
--- 3/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@@@ -7,12 -7,10 -7,11 +7,12 @@@@
   #include "string.h"
   #include "cache.h"
   #include "header.h"
 ++#include "debugfs.h"
   
 - int                                  nr_counters;
 + int                          nr_counters;
   
   struct perf_event_attr               attrs[MAX_COUNTERS];
 + char                         *filters[MAX_COUNTERS];
   
   struct event_symbol {
        u8              type;