include/linux/compiler-gcc4.h: Fix build bug - gcc-4.0.2 doesn't understand __builtin...
authorAndrew Morton <akpm@linux-foundation.org>
Fri, 9 Oct 2009 07:01:39 +0000 (00:01 -0700)
committerIngo Molnar <mingo@elte.hu>
Thu, 3 Dec 2009 06:29:17 +0000 (07:29 +0100)
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 <akpm@linux-foundation.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
LKML-Reference: <200910090724.n997OQl6013538@imap1.linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/compiler-gcc4.h

index 77542c5..e6ef279 100644 (file)
@@ -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)))