From: Ingo Molnar Date: Wed, 9 Apr 2008 09:03:37 +0000 (+0200) Subject: generic: make optimized inlining arch-opt-in X-Git-Tag: v3.12-rc1~21918^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=765c68bd54c76d4126796e49af2a1428a258429f;p=kernel%2Fkernel-generic.git 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 Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4d350b5..3b6ff3b 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 340bc5d..b2fd754 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))