Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f92131c3 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Jens Axboe
Browse files

bio: define __BIOVEC_PHYS_MERGEABLE 



Define __BIOVEC_PHYS_MERGEABLE as the default implementation of
BIOVEC_PHYS_MERGEABLE, so that its available for reuse within an
arch-specific definition of BIOVEC_PHYS_MERGEABLE.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 43381785

include/linux/bio.h

+5 −1
Original line number Diff line number Diff line
@@ -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) \