diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-01 15:54:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-01 18:49:02 -0400 |
| commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
| tree | 85acd4440799c46a372df9cad170fa0c21e59096 /arch/x86/kvm/Kconfig | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| parent | 2e572895bf3203e881356a4039ab0fa428ed2639 (diff) | |
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Diffstat (limited to 'arch/x86/kvm/Kconfig')
| -rw-r--r-- | arch/x86/kvm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 0a303c3ed11f..a58504ea78cc 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig | |||
| @@ -59,7 +59,8 @@ config KVM_AMD | |||
| 59 | 59 | ||
| 60 | config KVM_TRACE | 60 | config KVM_TRACE |
| 61 | bool "KVM trace support" | 61 | bool "KVM trace support" |
| 62 | depends on KVM && MARKERS && SYSFS | 62 | depends on KVM && SYSFS |
| 63 | select MARKERS | ||
| 63 | select RELAY | 64 | select RELAY |
| 64 | select DEBUG_FS | 65 | select DEBUG_FS |
| 65 | default n | 66 | default n |