From ba439aef3c10ee088652621a730c31466128dfdb Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 9 Oct 2009 00:01:39 -0700
Subject: [PATCH] --- yaml --- r: 169967 b: refs/heads/master c:
 7cff7ce94a7df2ccf5ac76b48ee0995fee2060df h: refs/heads/master i:   169965:
 fad140c2c8468d10ff44ec5baedd133ad6e205b9   169963:
 10a3066c0af876e805f70dfc137c429a04c55ddb   169959:
 e87bafea00b9fc52f4a60118bdf1ecae59c0b192   169951:
 119af3ded34ddcf65e9d5d099dc3b0e1a212daa0 v: v3

---
 [refs]                              | 2 +-
 trunk/include/linux/compiler-gcc4.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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)))