summaryrefslogtreecommitdiff
path: root/drivers/xen/Makefile
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-02-09 23:05:46 +0300
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-10-18 18:40:28 +0400
commitd8e0420603cf1ce9cb459c00ea0b7337de41b968 (patch)
tree10294b14b8f0a432763d2b87c38bd41538923d85 /drivers/xen/Makefile
parent23ace955c22cb9bdf703e4bdc9bf7379166113cd (diff)
downloadlinux-d8e0420603cf1ce9cb459c00ea0b7337de41b968.tar.xz
xen: define BIOVEC_PHYS_MERGEABLE()
Impact: allow Xen control of bio merging When running in Xen domain with device access, we need to make sure the block subsystem doesn't merge requests across pages which aren't machine physically contiguous. To do this, we define our own BIOVEC_PHYS_MERGEABLE. When CONFIG_XEN isn't enabled, or we're not running in a Xen domain, this has identical behaviour to the normal implementation. When running under Xen, we also make sure the underlying machine pages are the same or adjacent. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen/Makefile')
-rw-r--r--drivers/xen/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index fcaf838f54be..b47f5da674d3 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,4 +1,4 @@
-obj-y += grant-table.o features.o events.o manage.o
+obj-y += grant-table.o features.o events.o manage.o biomerge.o
obj-y += xenbus/
nostackp := $(call cc-option, -fno-stack-protector)