summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-10-15 06:12:28 +0200
committerIngo Molnar <mingo@elte.hu>2010-10-15 06:12:28 +0200
commit0fdf13606b67f830559abdaad15980c7f4f05ec4 (patch)
treedd69bf50a6d27cd15f1876657584e4e2b526d9d8 /arch
parentd9d572a9c0195486e3baf0d8d6a710196a707335 (diff)
parentcf4db2597ae93b60efc0a7a4ec08690b75d629b1 (diff)
downloadlinux-3.10-0fdf13606b67f830559abdaad15980c7f4f05ec4.tar.gz
linux-3.10-0fdf13606b67f830559abdaad15980c7f4f05ec4.tar.bz2
linux-3.10-0fdf13606b67f830559abdaad15980c7f4f05ec4.zip
Merge branch 'tip/perf/recordmcount-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c14d8b4d2f7..9815221976a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -33,6 +33,7 @@ config X86
select HAVE_KRETPROBES
select HAVE_OPTPROBES
select HAVE_FTRACE_MCOUNT_RECORD
+ select HAVE_C_RECORDMCOUNT
select HAVE_DYNAMIC_FTRACE
select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_GRAPH_TRACER