From: hch@lst.de (Christoph Hellwig)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/13] xen: provide a prototype for xen_biovec_phys_mergeable in xen.h
Date: Tue, 4 Sep 2018 12:14:21 -0700 [thread overview]
Message-ID: <20180904191431.20102-4-hch@lst.de> (raw)
In-Reply-To: <20180904191431.20102-1-hch@lst.de>
Having multiple externs in arch headers is not a good way to provide
a common interface.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm/include/asm/io.h | 3 ---
arch/arm64/include/asm/io.h | 3 ---
arch/x86/include/asm/io.h | 5 -----
include/xen/xen.h | 4 ++++
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 6774553dc214..9855a4d48956 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>
-struct bio_vec;
-extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
- const struct bio_vec *vec2);
#define BIOVEC_PHYS_MERGEABLE(vec1, vec2) \
(__BIOVEC_PHYS_MERGEABLE(vec1, vec2) && \
(!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)))
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h
index 35b2e50f17fb..9bc620c44d32 100644
--- a/arch/arm64/include/asm/io.h
+++ b/arch/arm64/include/asm/io.h
@@ -205,9 +205,6 @@ extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
extern int devmem_is_allowed(unsigned long pfn);
-struct bio_vec;
-extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
- const struct bio_vec *vec2);
#define BIOVEC_PHYS_MERGEABLE(vec1, vec2) \
(__BIOVEC_PHYS_MERGEABLE(vec1, vec2) && \
(!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)))
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 6de64840dd22..193dae6d9c45 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -371,11 +371,6 @@ extern bool is_early_ioremap_ptep(pte_t *ptep);
#ifdef CONFIG_XEN
#include <xen/xen.h>
-struct bio_vec;
-
-extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
- const struct bio_vec *vec2);
-
#define BIOVEC_PHYS_MERGEABLE(vec1, vec2) \
(__BIOVEC_PHYS_MERGEABLE(vec1, vec2) && \
(!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)))
diff --git a/include/xen/xen.h b/include/xen/xen.h
index 1e1d9bd0bd37..d7a2678da77f 100644
--- a/include/xen/xen.h
+++ b/include/xen/xen.h
@@ -39,4 +39,8 @@ extern uint32_t xen_start_flags;
#define xen_initial_domain() (0)
#endif /* CONFIG_XEN_DOM0 */
+struct bio_vec;
+bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
+ const struct bio_vec *vec2);
+
#endif /* _XEN_XEN_H */
--
2.18.0
next prev parent reply other threads:[~2018-09-04 19:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-04 19:14 clean up physical merging helpers Christoph Hellwig
2018-09-04 19:14 ` [PATCH 01/13] arm: remove the unused BIOVEC_MERGEABLE define Christoph Hellwig
2018-09-04 19:14 ` [PATCH 02/13] xen: remove the xen_biovec_phys_mergeable export Christoph Hellwig
2018-09-04 19:14 ` Christoph Hellwig [this message]
2018-09-04 19:14 ` [PATCH 04/13] block: move integrity_req_gap_{back, front}_merge to blk.h Christoph Hellwig
2018-09-04 19:14 ` [PATCH 05/13] block: move req_gap_{back,front}_merge to blk-merge.c Christoph Hellwig
2018-09-04 19:14 ` [PATCH 06/13] block: move req_gap_back_merge to blk.h Christoph Hellwig
2018-09-04 19:14 ` [PATCH 07/13] block: simplify BIOVEC_PHYS_MERGEABLE Christoph Hellwig
2018-09-04 19:14 ` [PATCH 08/13] block: add a missing BIOVEC_SEG_BOUNDARY check in bio_add_pc_page Christoph Hellwig
2018-09-04 19:14 ` [PATCH 09/13] block: merge BIOVEC_SEG_BOUNDARY into biovec_phys_mergeable Christoph Hellwig
2018-09-04 19:14 ` [PATCH 10/13] block: remove bvec_to_phys Christoph Hellwig
2018-09-04 19:36 ` Geert Uytterhoeven
2018-09-04 19:14 ` [PATCH 11/13] block: don't include io.h from bio.h Christoph Hellwig
2018-09-04 19:14 ` [PATCH 12/13] block: don't include bug.h " Christoph Hellwig
2018-09-04 19:14 ` [PATCH 13/13] xen: don't include <xen/xen.h> from <asm/io.h> and <asm/dma-mapping.h> Christoph Hellwig
2018-09-15 7:03 ` clean up physical merging helpers Christoph Hellwig
2018-09-15 14:47 ` Jens Axboe
2018-09-20 6:29 ` Christoph Hellwig
2018-09-20 7:52 ` Christoph Hellwig
2018-09-20 14:39 ` Jens Axboe
2018-09-24 14:25 ` [Xen-devel] " Boris Ostrovsky
2018-09-25 20:29 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180904191431.20102-4-hch@lst.de \
--to=hch@lst.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).