diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2009-10-09 03:01:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-03 01:29:17 -0500 |
| commit | 7cff7ce94a7df2ccf5ac76b48ee0995fee2060df (patch) | |
| tree | d9bbec339e1f412c58eb435f88c1a8cf9450531b | |
| parent | 99063c0bcebcc913165a5d168050326eba3e0996 (diff) | |
include/linux/compiler-gcc4.h: Fix build bug - gcc-4.0.2 doesn't understand __builtin_object_size
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>
| -rw-r--r-- | include/linux/compiler-gcc4.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 77542c57e20a..e6ef279ca20c 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h | |||
| @@ -38,7 +38,9 @@ | |||
| 38 | 38 | ||
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | #if __GNUC_MINOR__ > 0 | ||
| 41 | #define __compiletime_object_size(obj) __builtin_object_size(obj, 0) | 42 | #define __compiletime_object_size(obj) __builtin_object_size(obj, 0) |
| 43 | #endif | ||
| 42 | #if __GNUC_MINOR__ >= 4 | 44 | #if __GNUC_MINOR__ >= 4 |
| 43 | #define __compiletime_warning(message) __attribute__((warning(message))) | 45 | #define __compiletime_warning(message) __attribute__((warning(message))) |
| 44 | #define __compiletime_error(message) __attribute__((error(message))) | 46 | #define __compiletime_error(message) __attribute__((error(message))) |