Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Pulled mainline in order to get the UAPI infrastructure already
merged before I pull in David Howells's UAPI trees for networking.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 1 deletions

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index e5e71e7d95a0..86258c2a2c23 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -72,7 +72,7 @@ ifeq ($(ARCH),x86_64)
         override ARCH := x86
         IS_X86_64 := 0
         ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))
-                IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
+                IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1)
         endif
         ifeq (${IS_X86_64}, 1)
                 RAW_ARCH := x86_64
diff --git a/tools/perf/util/include/linux/rbtree.h b/tools/perf/util/include/linux/rbtree.h
index 2a030c5af3aa..9bcdc844b330 100644
--- a/tools/perf/util/include/linux/rbtree.h
+++ b/tools/perf/util/include/linux/rbtree.h
@@ -1,2 +1,3 @@
 #include <stdbool.h>
+#include <stdbool.h>
 #include "../../../../include/linux/rbtree.h"