diff options
| author | Mark Brown <broonie@kernel.org> | 2024-12-09 12:50:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-12-09 12:50:45 +0000 |
| commit | 1331fb6640440f42a709eafd5c802f3496f746b8 (patch) | |
| tree | 01fd6f6cf36155fe188aed05db07a030f509ac00 /kernel/sched | |
| parent | a308f9e47fc2377863f0f561ceedd45ccc7c7f9c (diff) | |
| parent | fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 (diff) | |
regmap: Merge up v6.12-rc2
This has fixes for several boards which help my testing a lot.
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/fair.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index fbdca89c677f..a59ae2e23daf 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3399,10 +3399,16 @@ retry_pids: /* Initialise new per-VMA NUMAB state. */ if (!vma->numab_state) { - vma->numab_state = kzalloc(sizeof(struct vma_numab_state), - GFP_KERNEL); - if (!vma->numab_state) + struct vma_numab_state *ptr; + + ptr = kzalloc(sizeof(*ptr), GFP_KERNEL); + if (!ptr) + continue; + + if (cmpxchg(&vma->numab_state, NULL, ptr)) { + kfree(ptr); continue; + } vma->numab_state->start_scan_seq = mm->numa_scan_seq; |