diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-09-25 22:30:08 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-09-26 16:45:11 +0200 |
| commit | c39ae60dfbda66922f644193b91850abcd4d588c (patch) | |
| tree | 2a3eafebe82a25988083d79cdd74ca2b0fa696db /drivers/xen/biomerge.c | |
| parent | xen: provide a prototype for xen_biovec_phys_mergeable in xen.h (diff) | |
| download | linux-c39ae60dfbda66922f644193b91850abcd4d588c.tar.xz linux-c39ae60dfbda66922f644193b91850abcd4d588c.zip | |
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 '')
| -rw-r--r-- | drivers/xen/biomerge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c index 399c4e30f723..f3fbb700f569 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, |