Merge branch 'linus' into perf/core

Conflicts:
	tools/perf/Makefile
	tools/perf/builtin-test.c
	tools/perf/perf.h
	tools/perf/tests/parse-events.c
	tools/perf/util/evsel.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/kernel/cpu/perf_event_p6.c
Simple merge

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

diff --cc tools/perf/Makefile
index a7c6aa8,0a619af..891bc77
--- 1/tools/perf/Makefile
--- 2/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@@ -169,16 -169,36 +169,44 @@@ endi
  
  ### --- END CONFIGURATION SECTION ---
  
- BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -Iutil -I. -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+ ifeq ($(srctree),)
+ srctree := $(patsubst %/,%,$(dir $(shell pwd)))
+ srctree := $(patsubst %/,%,$(dir $(srctree)))
+ #$(info Determined 'srctree' to be $(srctree))
+ endif
+ 
+ ifneq ($(objtree),)
+ #$(info Determined 'objtree' to be $(objtree))
+ endif
+ 
+ ifneq ($(OUTPUT),)
+ #$(info Determined 'OUTPUT' to be $(OUTPUT))
+ endif
+ 
+ BASIC_CFLAGS = \
+       -Iutil/include \
+       -Iarch/$(ARCH)/include \
+       $(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \
+       -I$(srctree)/arch/$(ARCH)/include/uapi \
+       -I$(srctree)/arch/$(ARCH)/include \
+       $(if $(objtree),-I$(objtree)/include/generated/uapi) \
+       -I$(srctree)/include/uapi \
+       -I$(srctree)/include \
+       -I$(OUTPUT)util \
+       -Iutil \
+       -I. \
+       -I$(TRACE_EVENT_DIR) \
+       -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
++
  BASIC_LDFLAGS =
  
 +ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)
 +      BIONIC := 1
 +      EXTLIBS := $(filter-out -lrt,$(EXTLIBS))
 +      EXTLIBS := $(filter-out -lpthread,$(EXTLIBS))
 +      BASIC_CFLAGS += -I.
 +endif
 +
  # Guard against environment variables
  BUILTIN_OBJS =
  LIB_H =

diff --cc tools/perf/builtin-kvm.c
index 836c82f,283b439..ca3f80e
--- 1/tools/perf/builtin-kvm.c
--- 2/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@@ -311,11 -312,11 +312,11 @@@ struct vcpu_event_record 
  };
  
  
- static void init_kvm_event_record(struct perf_kvm *kvm)
+ static void init_kvm_event_record(struct perf_kvm_stat *kvm)
  {
 -      int i;
 +      unsigned int i;
  
 -      for (i = 0; i < (int)EVENTS_CACHE_SIZE; i++)
 +      for (i = 0; i < EVENTS_CACHE_SIZE; i++)
                INIT_LIST_HEAD(&kvm->kvm_events_cache[i]);
  }
  

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

diff --cc tools/perf/tests/parse-events.c
index 42a0c8c,6ef213b..32ee478
--- 1/tools/perf/tests/parse-events.c
--- 2/tools/perf/util/parse-events-test.c
+++ b/tools/perf/tests/parse-events.c
@@@ -3,8 -3,7 +3,8 @@@
  #include "evsel.h"
  #include "evlist.h"
  #include "sysfs.h"
- #include "../../../include/linux/hw_breakpoint.h"
 +#include "tests.h"
+ #include <linux/hw_breakpoint.h>
  
  #define TEST_ASSERT_VAL(text, cond) \
  do { \

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

diff --cc tools/perf/util/evsel.h
Simple merge

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

diff --cc tools/perf/util/header.h
Simple merge

diff --cc tools/perf/util/parse-events.c
Simple merge

diff --cc tools/perf/util/parse-events.h
Simple merge

diff --cc tools/perf/util/pmu.h
Simple merge

diff --cc tools/perf/util/session.h
Simple merge