From 765c68bd54c76d4126796e49af2a1428a258429f Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 9 Apr 2008 11:03:37 +0200 Subject: [PATCH] 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 --- arch/x86/Kconfig | 3 +++ include/linux/compiler-gcc.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4d350b5cbc7..3b6ff3b4ad2 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 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)) -- 2.41.1