The patch titled
Subject: mm: slab.h: wrap the whole file with guarding macro
has been removed from the -mm tree. Its filename was
mm-slabh-wrap-the-whole-file-with-guarding-macro.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx>
Subject: mm: slab.h: wrap the whole file with guarding macro
Guarding section:
#ifndef MM_SLAB_H
#define MM_SLAB_H
...
#endif
currently doesn't cover the whole mm/slab.h. It seems like it was
done unintentionally.
Wrap the whole file by moving closing #endif to the end of it.
Signed-off-by: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx>
Acked-by: Christoph Lameter <cl@xxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Reviewed-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slab.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN mm/slab.h~mm-slabh-wrap-the-whole-file-with-guarding-macro mm/slab.h
--- a/mm/slab.h~mm-slabh-wrap-the-whole-file-with-guarding-macro
+++ a/mm/slab.h
@@ -260,7 +260,6 @@ static inline struct kmem_cache *cache_f
WARN_ON_ONCE(1);
return s;
}
-#endif
#ifndef CONFIG_SLOB
/*
@@ -311,3 +310,5 @@ static inline struct kmem_cache_node *ge
void *slab_next(struct seq_file *m, void *p, loff_t *pos);
void slab_stop(struct seq_file *m, void *p);
+
+#endif /* MM_SLAB_H */
_
Patches currently in -mm which might be from a.ryabinin@xxxxxxxxxxx are
origin.patch
lib-idr-fix-out-of-bounds-pointer-dereference.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
