diff --git a/[refs] b/[refs]
index a17fe4e3268a..c1f2f25a3fc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99063c0bcebcc913165a5d168050326eba3e0996
+refs/heads/master: 7cff7ce94a7df2ccf5ac76b48ee0995fee2060df
diff --git a/trunk/include/linux/compiler-gcc4.h b/trunk/include/linux/compiler-gcc4.h
index 77542c57e20a..e6ef279ca20c 100644
--- a/trunk/include/linux/compiler-gcc4.h
+++ b/trunk/include/linux/compiler-gcc4.h
@@ -38,7 +38,9 @@
 
 #endif
 
+#if __GNUC_MINOR__ > 0
 #define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+#endif
 #if __GNUC_MINOR__ >= 4
 #define __compiletime_warning(message) __attribute__((warning(message)))
 #define __compiletime_error(message) __attribute__((error(message)))