• Linus Torvalds's avatar
    Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 9c4bc1c2
    Linus Torvalds authored
    * '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
    9c4bc1c2
Makefile 708 Bytes