X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=block%2Fbio.c;h=57c2f327225bd13da2cc00506aeeb2986d13b637;hb=d4b7332eef46ed403061e27b03c71ad26b2f5353;hp=0a14af92373819d6ed25e332ae91c67720d36db9;hpb=2db96217e7e515071726ca4ec791742c4202a1b2;p=platform%2Fkernel%2Flinux-starfive.git

diff --git a/block/bio.c b/block/bio.c
index 0a14af9..57c2f32 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -867,6 +867,8 @@ static inline bool page_is_mergeable(const struct bio_vec *bv,
 	*same_page = ((vec_end_addr & PAGE_MASK) == page_addr);
 	if (*same_page)
 		return true;
+	else if (IS_ENABLED(CONFIG_KMSAN))
+		return false;
 	return (bv->bv_page + bv_end / PAGE_SIZE) == (page + off / PAGE_SIZE);
 }