diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 18:46:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 18:46:48 -0800 |
| commit | 9c4bc1c2befbbdce4b9fd526e67a7a2ea143ffa2 (patch) | |
| tree | 1b08c1bb00ce477ca947461777cd7e24de72c148 /drivers/xen/Kconfig | |
| parent | 2c0076d8c7eb1dafa03d0a792444862080b34106 (diff) | |
| parent | e1b478e4ec4477520767d1a920433626263a2a6b (diff) | |
Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/p2m: Fix module linking error.
xen p2m: clear the old pte when adding a page to m2p_override
xen gntdev: use gnttab_map_refs and gnttab_unmap_refs
xen: introduce gnttab_map_refs and gnttab_unmap_refs
xen p2m: transparently change the p2m mappings in the m2p override
xen/gntdev: Fix circular locking dependency
xen/gntdev: stop using "token" argument
xen: gntdev: move use of GNTMAP_contains_pte next to the map_op
xen: add m2p override mechanism
xen: move p2m handling to separate file
xen/gntdev: add VM_PFNMAP to vma
xen/gntdev: allow usermode to map granted pages
xen: define gnttab_set_map_op/unmap_op
Fix up trivial conflict in drivers/xen/Kconfig
Diffstat (limited to 'drivers/xen/Kconfig')
| -rw-r--r-- | drivers/xen/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 464d8935ad4e..07bec09d1dad 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -71,7 +71,14 @@ config XEN_SYS_HYPERVISOR but will have no xen contents. config XEN_XENBUS_FRONTEND - tristate + tristate + +config XEN_GNTDEV + tristate "userspace grant access device driver" + depends on XEN + select MMU_NOTIFIER + help + Allows userspace processes to use grants. config XEN_PLATFORM_PCI tristate "xen platform pci device driver" |