summaryrefslogtreecommitdiff
path: root/drivers/xen/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-09-06 09:59:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-09-06 09:59:27 -0700
commit68beef571071014ef34a3beac65fe2af7e8e3cf6 (patch)
tree7a6e7b5875e909baf587b947b536512d95d046de /drivers/xen/Makefile
parentdd9fb9bb3340c791a2be106fdc895db75f177343 (diff)
parent9e2369c06c8a181478039258a4598c1ddd2cadfa (diff)
Merge tag 'for-linus-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross: "A small series for fixing a problem with Xen PVH guests when running as backends (e.g. as dom0). Mapping other guests' memory is now working via ZONE_DEVICE, thus not requiring to abuse the memory hotplug functionality for that purpose" * tag 'for-linus-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: add helpers to allocate unpopulated memory memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC xen/balloon: add header guard
Diffstat (limited to 'drivers/xen/Makefile')
-rw-r--r--drivers/xen/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index c25c9a699b48..babdca808861 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -41,3 +41,4 @@ xen-gntdev-$(CONFIG_XEN_GNTDEV_DMABUF) += gntdev-dmabuf.o
xen-gntalloc-y := gntalloc.o
xen-privcmd-y := privcmd.o privcmd-buf.o
obj-$(CONFIG_XEN_FRONT_PGDIR_SHBUF) += xen-front-pgdir-shbuf.o
+obj-$(CONFIG_XEN_UNPOPULATED_ALLOC) += unpopulated-alloc.o