include/linux/compiler-gcc4.h: Fix build bug - gcc-4.0.2 doesn't understand __builtin...

Maybe 4.1.0 doesn't too, but this fixed it for me.

Caused by:

 4a31276: x86: Turn the copy_from_user check into an (optional) compile time warning
 9f0cf4a: x86: Use __builtin_object_size() to validate the buffer size for copy_from_user()

Signed-off-by: Andrew Morton <[email protected]>
Cc: Arjan van de Ven <[email protected]>
LKML-Reference: <200910090724[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 77542c57e20a4d03d7d916c3ffaa1395701d6dc6..e6ef279ca20c4147f4cc8918c7c20ef9964d0ffa 100644 (file)
--- a/include/linux/compiler-gcc4.h
+++ b/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)))