The patch titled
Subject: kmemcheck: correctly remove kmemcheck call from dma_map_sg_attrs
has been removed from the -mm tree. Its filename was
kmemcheck-remove-annotations-fix.patch
This patch was dropped because it was folded into kmemcheck-remove-annotations.patch
------------------------------------------------------
From: "Levin, Alexander (Sasha Levin)" <alexander.levin@xxxxxxxxxxx>
Subject: kmemcheck: correctly remove kmemcheck call from dma_map_sg_attrs
We have missed removing some code as part of removing the kmemcheck
hooks.
Unfourtenatly this got missed during my review, and the code was
still building.
Link: http://lkml.kernel.org/r/20171012192151.26531-1-alexander.levin@xxxxxxxxxxx
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Reported-by: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/dma-mapping.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff -puN include/linux/dma-mapping.h~kmemcheck-remove-annotations-fix include/linux/dma-mapping.h
--- a/include/linux/dma-mapping.h~kmemcheck-remove-annotations-fix
+++ a/include/linux/dma-mapping.h
@@ -261,10 +261,8 @@ static inline int dma_map_sg_attrs(struc
unsigned long attrs)
{
const struct dma_map_ops *ops = get_dma_ops(dev);
- int i, ents;
- struct scatterlist *s;
+ int ents;
- for_each_sg(sg, s, nents, i)
BUG_ON(!valid_dma_direction(dir));
ents = ops->map_sg(dev, sg, nents, dir, attrs);
BUG_ON(ents < 0);
_
Patches currently in -mm which might be from alexander.levin@xxxxxxxxxxx are
kmemcheck-remove-annotations.patch
kmemcheck-stop-using-gfp_notrack-and-slab_notrack.patch
kmemcheck-remove-whats-left-of-notrack-flags.patch
kmemcheck-rip-it-out.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
