Merge branch 'slab/urgent' into slab/next

1 files changed, 4 insertions, 4 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 7d92f08b88d7..a18ba57517af 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2289,8 +2289,8 @@ kmem_cache_create (const char *name, size_t size, size_t align,
         if (ralign < align) {
                 ralign = align;
         }
-        /* disable debug if not aligning with REDZONE_ALIGN */
-        if (ralign & (__alignof__(unsigned long long) - 1))
+        /* disable debug if necessary */
+        if (ralign > __alignof__(unsigned long long))
                 flags &= ~(SLAB_RED_ZONE | SLAB_STORE_USER);
         /*
          * 4) Store it.
@@ -2316,8 +2316,8 @@ kmem_cache_create (const char *name, size_t size, size_t align,
          */
         if (flags & SLAB_RED_ZONE) {
                 /* add space for red zone words */
-                cachep->obj_offset += align;
-                size += align + sizeof(unsigned long long);
+                cachep->obj_offset += sizeof(unsigned long long);
+                size += 2 * sizeof(unsigned long long);
         }
         if (flags & SLAB_STORE_USER) {
                 /* user store requires one word storage behind the end of