diff --git a/[refs] b/[refs]
index f18bbaef6385..6b764ac84046 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe392c535644b8ee370a219ca63557611e0b0365
+refs/heads/master: 86d5a70c1eeb3d35bcadc94753fd9651df8835a8
diff --git a/trunk/tools/perf/util/include/linux/compiler.h b/trunk/tools/perf/util/include/linux/compiler.h
index 2dc867128e46..ce2367b7b3f6 100644
--- a/trunk/tools/perf/util/include/linux/compiler.h
+++ b/trunk/tools/perf/util/include/linux/compiler.h
@@ -12,4 +12,8 @@
 #define __used		__attribute__((__unused__))
 #define __packed	__attribute__((__packed__))
 
+#ifndef __force
+#define __force
+#endif
+
 #endif
diff --git a/trunk/tools/perf/util/include/linux/kernel.h b/trunk/tools/perf/util/include/linux/kernel.h
index 4af9a10cc2d2..a978f269d8d2 100644
--- a/trunk/tools/perf/util/include/linux/kernel.h
+++ b/trunk/tools/perf/util/include/linux/kernel.h
@@ -46,6 +46,15 @@
 	_min1 < _min2 ? _min1 : _min2; })
 #endif
 
+#ifndef roundup
+#define roundup(x, y) (                                \
+{                                                      \
+	const typeof(y) __y = y;		       \
+	(((x) + (__y - 1)) / __y) * __y;	       \
+}                                                      \
+)
+#endif
+
 #ifndef BUG_ON
 #ifdef NDEBUG
 #define BUG_ON(cond) do { if (cond) {} } while (0)
diff --git a/trunk/tools/perf/util/include/linux/types.h b/trunk/tools/perf/util/include/linux/types.h
index 12de3b8112f9..eb464786c084 100644
--- a/trunk/tools/perf/util/include/linux/types.h
+++ b/trunk/tools/perf/util/include/linux/types.h
@@ -3,6 +3,14 @@
 
 #include <asm/types.h>
 
+#ifndef __bitwise
+#define __bitwise
+#endif
+
+#ifndef __le32
+typedef __u32 __bitwise __le32;
+#endif
+
 #define DECLARE_BITMAP(name,bits) \
 	unsigned long name[BITS_TO_LONGS(bits)]