summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-04-09 13:03:37 +0400
committerIngo Molnar <mingo@elte.hu>2008-04-26 19:44:55 +0400
commit765c68bd54c76d4126796e49af2a1428a258429f (patch)
tree3891c95c96776125a6a3b37aebfbc6fb1a14765e /include
parent60a3cdd0639473c79c253bc08c8ef8f882cca107 (diff)
downloadlinux-765c68bd54c76d4126796e49af2a1428a258429f.tar.xz
generic: make optimized inlining arch-opt-in
Stephen Rothwell reported that linux-next did not build on powerpc64. make optimized inlining dependent on architecture opt-in. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/compiler-gcc.h3
1 files changed, 2 insertions, 1 deletions
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))