xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: simplify BIOVEC_PHYS_MERGEABLE

Browse Source 
Turn the macro into an inline, move it to blk.h and simplify the
arch hooks a bit.

Also rename the function to biovec_phys_mergeable as there is no need
to shout.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig
2018-09-24 09:43:50 +02:00
committed by Jens Axboe
parent 27ca1d4ed0
commit 6a9f5f240a
8 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/include/asm/io.h
View File

@@ -376,9 +376,8 @@ 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)))
#define ARCH_BIOVEC_PHYS_MERGEABLE(vec1, vec2) \
(!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2))
#endif /* CONFIG_XEN */
#define IO_SPACE_LIMIT 0xffff