Subject: [merged] mm-fix-some-indenting-in-cmpxchg_double_slab.patch removed from -mm tree To: dan.carpenter@xxxxxxxxxx,cl@xxxxxxxxxxxxxxxxxxxx,penberg@xxxxxxxxxx,rientjes@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 27 May 2014 13:22:37 -0700 The patch titled Subject: mm/slub.c: fix some indenting in cmpxchg_double_slab() has been removed from the -mm tree. Its filename was mm-fix-some-indenting-in-cmpxchg_double_slab.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Subject: mm/slub.c: fix some indenting in cmpxchg_double_slab() The return statement goes with the cmpxchg_double() condition so it needs to be indented another tab. Also these days the fashion is to line function parameters up, and it looks nicer that way because then the "freelist_new" is not at the same indent level as the "return 1;". Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slub.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN mm/slub.c~mm-fix-some-indenting-in-cmpxchg_double_slab mm/slub.c --- a/mm/slub.c~mm-fix-some-indenting-in-cmpxchg_double_slab +++ a/mm/slub.c @@ -382,9 +382,9 @@ static inline bool __cmpxchg_double_slab defined(CONFIG_HAVE_ALIGNED_STRUCT_PAGE) if (s->flags & __CMPXCHG_DOUBLE) { if (cmpxchg_double(&page->freelist, &page->counters, - freelist_old, counters_old, - freelist_new, counters_new)) - return 1; + freelist_old, counters_old, + freelist_new, counters_new)) + return 1; } else #endif { @@ -418,9 +418,9 @@ static inline bool cmpxchg_double_slab(s defined(CONFIG_HAVE_ALIGNED_STRUCT_PAGE) if (s->flags & __CMPXCHG_DOUBLE) { if (cmpxchg_double(&page->freelist, &page->counters, - freelist_old, counters_old, - freelist_new, counters_new)) - return 1; + freelist_old, counters_old, + freelist_new, counters_new)) + return 1; } else #endif { _ Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are mm-page_alloc-calculate-classzone_idx-once-from-the-zonelist-ref-fix.patch lib-stringc-use-the-name-c-string-in-comments.patch linux-next.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