The patch titled Subject: mm/slab.c: replace open-coded round-up code with ALIGN has been added to the -mm tree. Its filename is subject-mm-slab-trivial-change-to-replace-round-up-code-with-align.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/subject-mm-slab-trivial-change-to-replace-round-up-code-with-align.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/subject-mm-slab-trivial-change-to-replace-round-up-code-with-align.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: Canjiang Lu <canjiang.lu@xxxxxxxxxxx> Subject: mm/slab.c: replace open-coded round-up code with ALIGN Link: http://lkml.kernel.org/r/20170616072918epcms5p4ff16c24ef8472b4c3b4371823cd87856@epcms5p4 Signed-off-by: Canjiang Lu <canjiang.lu@xxxxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slab.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff -puN mm/slab.c~subject-mm-slab-trivial-change-to-replace-round-up-code-with-align mm/slab.c --- a/mm/slab.c~subject-mm-slab-trivial-change-to-replace-round-up-code-with-align +++ a/mm/slab.c @@ -2040,17 +2040,13 @@ __kmem_cache_create (struct kmem_cache * * unaligned accesses for some archs when redzoning is used, and makes * sure any on-slab bufctl's are also correctly aligned. */ - if (size & (BYTES_PER_WORD - 1)) { - size += (BYTES_PER_WORD - 1); - size &= ~(BYTES_PER_WORD - 1); - } + size = ALIGN(size, BYTES_PER_WORD); if (flags & SLAB_RED_ZONE) { ralign = REDZONE_ALIGN; /* If redzoning, ensure that the second redzone is suitably * aligned, by adjusting the object size accordingly. */ - size += REDZONE_ALIGN - 1; - size &= ~(REDZONE_ALIGN - 1); + size = ALIGN(size, REDZONE_ALIGN); } /* 3) caller mandated alignment */ _ Patches currently in -mm which might be from canjiang.lu@xxxxxxxxxxx are subject-mm-slab-trivial-change-to-replace-round-up-code-with-align.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