summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-09-25 13:30:08 -0700
committerJens Axboe <axboe@kernel.dk>2018-09-26 08:45:11 -0600
commitc39ae60dfbda66922f644193b91850abcd4d588c (patch)
tree2a3eafebe82a25988083d79cdd74ca2b0fa696db /arch/arm/include/asm
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 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/io.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index cf5cd88e7289..6ae7674da0d6 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -459,9 +459,6 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);
#include <asm-generic/io.h>
-#define ARCH_BIOVEC_PHYS_MERGEABLE(vec1, vec2) \
- (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2))
-
#ifdef CONFIG_MMU
#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
extern int valid_phys_addr_range(phys_addr_t addr, size_t size);