aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-09-25 20:30:08 (GMT)
committerJens Axboe <axboe@kernel.dk>2018-09-26 14:45:11 (GMT)
commitc39ae60dfbda66922f644193b91850abcd4d588c (patch)
tree2a3eafebe82a25988083d79cdd74ca2b0fa696db /drivers/xen
parent20e3267601f95ff62d7a3116a17a680e9f5cbcc9 (diff)
block: remove ARCH_BIOVEC_PHYS_MERGEABLE
Take the Xen check into the core code instead of delegating it to the architectures. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/biomerge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c
index 399c4e3..f3fbb70 100644
--- a/drivers/xen/biomerge.c
+++ b/drivers/xen/biomerge.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/bio.h>
-#include <linux/io.h>
#include <linux/export.h>
+#include <xen/xen.h>
#include <xen/page.h>
bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,

Privacy Policy