WORKAROUND: DOMU can always merge biovec

diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c
index 4da69dbf7dcad7f2e2898dd807a118596f86058a..955e2bc4f7481e5c9762d2b9a6d6e1e29edc5dd0 100644 (file)
--- 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);