1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index f6995cdfe714..ff82e24573b6 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -432,11 +432,13 @@ void __init fork_init(void)
         int i;
 #ifndef CONFIG_ARCH_TASK_STRUCT_ALLOCATOR
 #ifndef ARCH_MIN_TASKALIGN
-#define ARCH_MIN_TASKALIGN      L1_CACHE_BYTES
+#define ARCH_MIN_TASKALIGN      0
 #endif
+        int align = max_t(int, L1_CACHE_BYTES, ARCH_MIN_TASKALIGN);
+
         /* create a slab on which task_structs can be allocated */
         task_struct_cachep = kmem_cache_create("task_struct",
-                        arch_task_struct_size, ARCH_MIN_TASKALIGN,
+                        arch_task_struct_size, align,
                         SLAB_PANIC|SLAB_NOTRACK|SLAB_ACCOUNT, NULL);
 #endif