diff --git a/[refs] b/[refs]
index ca1940e6f9d1..4cc623605d8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 657eee7d25fb1422422ca32d5619185ae56a245d
+refs/heads/master: 2fb0815c9ee6b9ac50e15dd8360ec76d9fa46a22
diff --git a/trunk/include/linux/compiler-gcc4.h b/trunk/include/linux/compiler-gcc4.h
index 68b162d92254..842de225055f 100644
--- a/trunk/include/linux/compiler-gcc4.h
+++ b/trunk/include/linux/compiler-gcc4.h
@@ -13,7 +13,7 @@
 #define __must_check 		__attribute__((warn_unused_result))
 #define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
 
-#if GCC_VERSION >= 40100
+#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
 # define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
 #endif