The patch titled Subject: mm: slab.h: wrap the whole file with guarding macro has been added to the -mm tree. Its filename is mm-slabh-wrap-the-whole-file-with-guarding-macro.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-slabh-wrap-the-whole-file-with-guarding-macro.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-slabh-wrap-the-whole-file-with-guarding-macro.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slab.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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,8 +260,6 @@ static inline struct kmem_cache *cache_f WARN_ON_ONCE(1); return s; } -#endif - /* * The slab lists for all objects. @@ -309,3 +307,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 mm-slabh-wrap-the-whole-file-with-guarding-macro.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