The patch titled Subject: slub: mark the dangling ifdef #else of CONFIG_SLUB_DEBUG has been added to the -mm tree. Its filename is slub-mark-the-dangling-ifdef-else-of-config_slub_debug.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/slub-mark-the-dangling-ifdef-else-of-config_slub_debug.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/slub-mark-the-dangling-ifdef-else-of-config_slub_debug.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: Jesper Dangaard Brouer <brouer@xxxxxxxxxx> Subject: slub: mark the dangling ifdef #else of CONFIG_SLUB_DEBUG The #ifdef of CONFIG_SLUB_DEBUG is located very far from the associated #else. For readability mark it with a comment. Signed-off-by: Jesper Dangaard Brouer <brouer@xxxxxxxxxx> Acked-by: Christoph Lameter <cl@xxxxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Alexander Duyck <alexander.h.duyck@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/slub.c~slub-mark-the-dangling-ifdef-else-of-config_slub_debug mm/slub.c --- a/mm/slub.c~slub-mark-the-dangling-ifdef-else-of-config_slub_debug +++ a/mm/slub.c @@ -1202,7 +1202,7 @@ unsigned long kmem_cache_flags(unsigned return flags; } -#else +#else /* !CONFIG_SLUB_DEBUG */ static inline void setup_object_debug(struct kmem_cache *s, struct page *page, void *object) {} _ Patches currently in -mm which might be from brouer@xxxxxxxxxx are slub-mark-the-dangling-ifdef-else-of-config_slub_debug.patch slab-implement-bulking-for-slab-allocator.patch slub-support-for-bulk-free-with-slub-freelists.patch slub-optimize-bulk-slowpath-free-by-detached-freelist.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