From: Julien Grall <julien.grall@citrix.com>
Date: Thu, 22 Oct 2015 10:33:11 +0000 (+0100)
Subject: WORKAROUND: DOMU can always merge biovec
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7059fb95dcba5e2521c536d6f5eb2b14dc40435c;p=people%2Fjulieng%2Flinux-arm.git

WORKAROUND: DOMU can always merge biovec
---

diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c
index 4da69dbf7dca..955e2bc4f748 100644
--- a/drivers/xen/biomerge.c
+++ b/drivers/xen/biomerge.c
@@ -17,7 +17,7 @@ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
 	 * XXX: Add support for merging bio_vec when using different page
 	 * size in Xen and Linux.
 	 */
-	return 0;
+	return !xen_initial_domain();
 #endif
 }
 EXPORT_SYMBOL(xen_biovec_phys_mergeable);