From b5556463ff4f493a014cebc6c264dbfdcc3b8670 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 11 Nov 2008 10:22:36 +0100 Subject: [PATCH] --- yaml --- r: 121090 b: refs/heads/master c: f1c4be5edad3756212cbbbeab39428fe90c27109 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index db4d2c155d87..42749bd23d15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15e6cb3673ea6277999642802406a764b49391b0 +refs/heads/master: f1c4be5edad3756212cbbbeab39428fe90c27109 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index ca91e50bdb10..0de793cf2144 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -11,7 +11,6 @@ config 64BIT config X86_32 def_bool !64BIT - select HAVE_FUNCTION_RET_TRACER config X86_64 def_bool 64BIT @@ -30,6 +29,7 @@ config X86 select HAVE_FTRACE_MCOUNT_RECORD select HAVE_DYNAMIC_FTRACE select HAVE_FUNCTION_TRACER + select HAVE_FUNCTION_RET_TRACER if X86_32 select HAVE_FUNCTION_TRACE_MCOUNT_TEST select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER