diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:00 +0200 |
| commit | bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (patch) | |
| tree | 702dd6a7ce06d224d594c2293af546b11ac9f51b /arch/x86/Kconfig | |
| parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 (diff) | |
| parent | 98a05ed4bd7774f533ab185fe0bf2fdc58292d7c (diff) | |
| download | linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.tar.gz linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.tar.bz2 linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.zip | |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index bf07b6f50fa1..c3a4c03c0800 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -23,6 +23,8 @@ config X86 select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_DYNAMIC_FTRACE + select HAVE_FTRACE select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER |