Messages in this thread Patch in this message | | | Date | Mon, 20 Feb 2017 02:25:09 -0800 | From | tip-bot for Peter Zijlstra <> | Subject | [tip:locking/core] fork: Fix task_struct alignment |
| |
Commit-ID: 95cb64c1fe61e70685a95f6260c8e9cd219fe08c Gitweb: http://git.kernel.org/tip/95cb64c1fe61e70685a95f6260c8e9cd219fe08c Author: Peter Zijlstra <peterz@infradead.org> AuthorDate: Sat, 18 Feb 2017 15:26:45 +0100 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Mon, 20 Feb 2017 11:22:37 +0100
fork: Fix task_struct alignment
Stupid bug that wrecked the alignment of task_struct and causes WARN()s in the x86 FPU code on some platforms.
Reported-by: Fengguang Wu <fengguang.wu@intel.com> Tested-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Fixes: e274795ea7b7 ("locking/mutex: Fix mutex handoff") Link: http://lkml.kernel.org/r/20170218142645.GH6500@twins.programming.kicks-ass.net Signed-off-by: Ingo Molnar <mingo@kernel.org> --- kernel/fork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/fork.c b/kernel/fork.c index a90510d..ea33f8a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -434,7 +434,7 @@ void __init fork_init(void) #ifndef ARCH_MIN_TASKALIGN #define ARCH_MIN_TASKALIGN 0 #endif - int align = min_t(int, L1_CACHE_BYTES, ARCH_MIN_TASKALIGN); + 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",
| |