Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186323
b: refs/heads/master
c: 27fb7f0
h: refs/heads/master
i:
  186321: aeb7c61
  186319: 42dda32
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Mar 6, 2010
1 parent 6147b61 commit 6cc4eb3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6aed359df4d82c38145d95957b741f0b08d24074
refs/heads/master: 27fb7f009bdb1ff13d4e4c008a2fd36b2305055b
12 changes: 7 additions & 5 deletions trunk/drivers/xen/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
menu "Xen driver support"
depends on XEN

config XEN_BALLOON
bool "Xen memory balloon driver"
depends on XEN
default y
help
The balloon driver allows the Xen domain to request more memory from
Expand All @@ -20,7 +22,6 @@ config XEN_SCRUB_PAGES

config XEN_DEV_EVTCHN
tristate "Xen /dev/xen/evtchn device"
depends on XEN
default y
help
The evtchn driver allows a userspace process to triger event
Expand All @@ -30,7 +31,6 @@ config XEN_DEV_EVTCHN

config XENFS
tristate "Xen filesystem"
depends on XEN
default y
help
The xen filesystem provides a way for domains to share
Expand All @@ -53,11 +53,13 @@ config XEN_COMPAT_XENFS

config XEN_SYS_HYPERVISOR
bool "Create xen entries under /sys/hypervisor"
depends on XEN && SYSFS
depends on SYSFS
select SYS_HYPERVISOR
default y
help
Create entries under /sys/hypervisor describing the Xen
hypervisor environment. When running native or in another
virtual environment, /sys/hypervisor will still be present,
but will have no xen contents.
but will have no xen contents.

endmenu

0 comments on commit 6cc4eb3

Please sign in to comment.