diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-09-25 13:30:08 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-09-26 08:45:11 -0600 |
| commit | c39ae60dfbda66922f644193b91850abcd4d588c (patch) | |
| tree | 2a3eafebe82a25988083d79cdd74ca2b0fa696db /arch/x86/include/asm/io.h | |
| parent | 20e3267601f95ff62d7a3116a17a680e9f5cbcc9 (diff) | |
| download | linux-0-day-c39ae60dfbda66922f644193b91850abcd4d588c.tar.gz linux-0-day-c39ae60dfbda66922f644193b91850abcd4d588c.tar.xz | |
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 'arch/x86/include/asm/io.h')
| -rw-r--r-- | arch/x86/include/asm/io.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index abdb501a551d7..232d8e9ee8a0e 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -371,9 +371,6 @@ extern bool is_early_ioremap_ptep(pte_t *ptep); #ifdef CONFIG_XEN #include <xen/xen.h> - -#define ARCH_BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ - (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)) #endif /* CONFIG_XEN */ #define IO_SPACE_LIMIT 0xffff |