diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-09 21:05:30 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-09 21:05:30 +0200 |
| commit | 0bc99dcffd027019fb47fa61735e5a8843dfc698 (patch) | |
| tree | b2425fe02b6b8281d181224babbe8071c4c2849e /kernel/fork.c | |
| parent | f3e80afbdf1062ea584754bb17569ee363adb267 (diff) | |
| parent | 56de113da14706d6a1b28648e9ff5c261f536201 (diff) | |
| download | linux-next-0bc99dcffd027019fb47fa61735e5a8843dfc698.tar.gz linux-next-0bc99dcffd027019fb47fa61735e5a8843dfc698.zip | |
Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index ceedb07a5a00..ea823b28d625 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -858,7 +858,8 @@ void __init fork_init(void) #ifndef ARCH_MIN_TASKALIGN #define ARCH_MIN_TASKALIGN 0 #endif - int align = max_t(int, L1_CACHE_BYTES, ARCH_MIN_TASKALIGN); + int align = max3(L1_CACHE_BYTES, ARCH_MIN_TASKALIGN, + __alignof__(struct task_struct)); unsigned long useroffset, usersize; /* create a slab on which task_structs can be allocated */ |