2 files changed, 5 insertions, 1 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4d350b5cbc71..3b6ff3b4ad20 100644
--- a/arch/x86/Kconfig
+++ b/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/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 340bc5d92772..b2fd7547b58d 100644
--- a/include/linux/compiler-gcc.h
+++ b/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))