diff --git a/[refs] b/[refs]
index 66a1cfc49e4b..0dda12d9a384 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 777d1d71db622a5e1ff703495741c3d257b532e5
+refs/heads/master: 195bcbf5078d74c8e00d68f04eb8695196fb31e8
diff --git a/trunk/tools/perf/util/include/linux/compiler.h b/trunk/tools/perf/util/include/linux/compiler.h
index 791f9dd27ebf..547628e97f3d 100644
--- a/trunk/tools/perf/util/include/linux/compiler.h
+++ b/trunk/tools/perf/util/include/linux/compiler.h
@@ -5,7 +5,9 @@
 #define __always_inline	inline
 #endif
 #define __user
+#ifndef __attribute_const__
 #define __attribute_const__
+#endif
 
 #define __used		__attribute__((__unused__))