git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...
[pandora-kernel.git]
/
arch
/
x86
/
xen
/
Kconfig
diff --git
a/arch/x86/xen/Kconfig
b/arch/x86/xen/Kconfig
index
5cc821c
..
26c731a
100644
(file)
--- a/
arch/x86/xen/Kconfig
+++ b/
arch/x86/xen/Kconfig
@@
-25,8
+25,7
@@
config XEN_PRIVILEGED_GUEST
config XEN_PVHVM
def_bool y
config XEN_PVHVM
def_bool y
- depends on XEN
- depends on X86_LOCAL_APIC
+ depends on XEN && PCI && X86_LOCAL_APIC
config XEN_MAX_DOMAIN_MEMORY
int
config XEN_MAX_DOMAIN_MEMORY
int
@@
-49,11
+48,3
@@
config XEN_DEBUG_FS
help
Enable statistics output and various tuning options in debugfs.
Enabling this option may incur a significant performance overhead.
help
Enable statistics output and various tuning options in debugfs.
Enabling this option may incur a significant performance overhead.
-
-config XEN_DEBUG
- bool "Enable Xen debug checks"
- depends on XEN
- default n
- help
- Enable various WARN_ON checks in the Xen MMU code.
- Enabling this option WILL incur a significant performance overhead.