Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=c...

Commit:     765c68bd54c76d4126796e49af2a1428a258429f

Parent:     60a3cdd0639473c79c253bc08c8ef8f882cca107

Author:     Ingo Molnar <mingo@elte.hu>

AuthorDate: Wed Apr 9 11:03:37 2008 +0200

Committer:  Ingo Molnar <mingo@elte.hu>

CommitDate: Sat Apr 26 17:44:55 2008 +0200
    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>

---

 arch/x86/Kconfig             |    3 +++

 include/linux/compiler-gcc.h |    3 ++-

 2 files changed, 5 insertions(+), 1 deletions(-)
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))

--