X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fcompiler-gcc.h;h=b2fd7547b58deaa5e90b0fa5b384c0581da19d58;hb=0e88460da6ab7bb6a7ef83675412ed5b6315d741;hp=340bc5d9277210a911bbd1d88599332244b27761;hpb=60a3cdd0639473c79c253bc08c8ef8f882cca107;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 340bc5d9277..b2fd7547b58 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))