diff --git a/[refs] b/[refs]
index 0985e13336d3..d6e108d22a82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60a3cdd0639473c79c253bc08c8ef8f882cca107
+refs/heads/master: 765c68bd54c76d4126796e49af2a1428a258429f
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 4d350b5cbc71..3b6ff3b4ad20 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -142,6 +142,9 @@ config AUDIT_ARCH
 config ARCH_SUPPORTS_AOUT
 	def_bool y
 
+config ARCH_SUPPORTS_OPTIMIZED_INLINING
+	def_bool y
+
 # Use the generic interrupt handling code in kernel/irq/:
 config GENERIC_HARDIRQS
 	bool
diff --git a/trunk/include/linux/compiler-gcc.h b/trunk/include/linux/compiler-gcc.h
index 340bc5d92772..b2fd7547b58d 100644
--- a/trunk/include/linux/compiler-gcc.h
+++ b/trunk/include/linux/compiler-gcc.h
@@ -31,7 +31,8 @@
 /*
  * Force always-inline if the user requests it so via the .config:
  */
-#if !defined(CONFIG_OPTIMIZE_INLINING) && (__GNUC__ >= 4)
+#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
+    !defined(CONFIG_OPTIMIZE_INLINING) && (__GNUC__ >= 4)
 # define inline		inline		__attribute__((always_inline))
 # define __inline__	__inline__	__attribute__((always_inline))
 # define __inline	__inline	__attribute__((always_inline))