diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:52:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:52:30 -0400 |
| commit | c493756e2a8a78bcaae30668317890dcfe86e7c3 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/x86/xen/Kconfig | |
| parent | 0d15504f16f68725e4635aa85411015d1c573b0a (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/x86/xen/Kconfig')
| -rw-r--r-- | arch/x86/xen/Kconfig | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 3815e425f470..87b9ab166423 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig | |||
| @@ -26,5 +26,13 @@ config XEN_MAX_DOMAIN_MEMORY | |||
| 26 | 26 | ||
| 27 | config XEN_SAVE_RESTORE | 27 | config XEN_SAVE_RESTORE |
| 28 | bool | 28 | bool |
| 29 | depends on PM | 29 | depends on XEN && PM |
| 30 | default y \ No newline at end of file | 30 | default y |
| 31 | |||
| 32 | config XEN_DEBUG_FS | ||
| 33 | bool "Enable Xen debug and tuning parameters in debugfs" | ||
| 34 | depends on XEN && DEBUG_FS | ||
| 35 | default n | ||
| 36 | help | ||
| 37 | Enable statistics output and various tuning options in debugfs. | ||
| 38 | Enabling this option may incur a significant performance overhead. | ||