diff --git a/[refs] b/[refs]
index 4171fdc99c69..119a04515451 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53809d7eaef9503eb2589babdaba5ef0b661bb14
+refs/heads/master: ae3a0064e6d69068b1c9fd075095da062430bda9
diff --git a/trunk/include/linux/compiler-gcc.h b/trunk/include/linux/compiler-gcc.h
index b2fd7547b58d..5c8351b859f0 100644
--- a/trunk/include/linux/compiler-gcc.h
+++ b/trunk/include/linux/compiler-gcc.h
@@ -29,10 +29,11 @@
   BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0])))
 
 /*
- * Force always-inline if the user requests it so via the .config:
+ * Force always-inline if the user requests it so via the .config,
+ * or if gcc is too old:
  */
 #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
-    !defined(CONFIG_OPTIMIZE_INLINING) && (__GNUC__ >= 4)
+    !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
 # define inline		inline		__attribute__((always_inline))
 # define __inline__	__inline__	__attribute__((always_inline))
 # define __inline	__inline	__attribute__((always_inline))