diff options
Diffstat (limited to 'include/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 1c91a176b9a..6a642098e5c 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -236,12 +236,16 @@ static inline void *bio_data(struct bio *bio)  #define __BVEC_END(bio)		bio_iovec_idx((bio), (bio)->bi_vcnt - 1)  #define __BVEC_START(bio)	bio_iovec_idx((bio), (bio)->bi_idx) +/* Default implementation of BIOVEC_PHYS_MERGEABLE */ +#define __BIOVEC_PHYS_MERGEABLE(vec1, vec2)	\ +	((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) +  /*   * allow arch override, for eg virtualized architectures (put in asm/io.h)   */  #ifndef BIOVEC_PHYS_MERGEABLE  #define BIOVEC_PHYS_MERGEABLE(vec1, vec2)	\ -	((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) +	__BIOVEC_PHYS_MERGEABLE(vec1, vec2)  #endif  #define __BIO_SEG_BOUNDARY(addr1, addr2, mask) \  |