projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'block-6.1-2022-10-20' of git://git.kernel.dk/linux
[platform/kernel/linux-starfive.git]
/
block
/
bio.c
diff --git
a/block/bio.c
b/block/bio.c
index
0a14af9
..
57c2f32
100644
(file)
--- 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);
}