diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-18 03:05:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-18 03:05:29 +0200 |
| commit | 10b82d5176488acee2820e5a2cf0f2ec5c3488b6 (patch) | |
| tree | 620cde6d79098cc681715ed69c6fca2e79dbd764 /mm | |
| parent | Merge tag 'drm-fixes-2020-09-18' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | percpu: fix first chunk size calculation for populated bitmap (diff) | |
| download | linux-10b82d5176488acee2820e5a2cf0f2ec5c3488b6.tar.xz linux-10b82d5176488acee2820e5a2cf0f2ec5c3488b6.zip | |
Merge branch 'for-5.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu
Pull percpu fix from Dennis Zhou:
"This is a fix for the first chunk size calculation where the variable
length array incorrectly used the number of longs instead of bytes of
longs.
This came in as a code fix and not a bug report, so I don't think it
was widely problematic. I believe it worked out due to it being
memblock memory and alignment requirements working in our favor"
* 'for-5.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
percpu: fix first chunk size calculation for populated bitmap
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/percpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index f4709629e6de..1ed1a349eab8 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1316,7 +1316,7 @@ static struct pcpu_chunk * __init pcpu_alloc_first_chunk(unsigned long tmp_addr, /* allocate chunk */ alloc_size = sizeof(struct pcpu_chunk) + - BITS_TO_LONGS(region_size >> PAGE_SHIFT); + BITS_TO_LONGS(region_size >> PAGE_SHIFT) * sizeof(unsigned long); chunk = memblock_alloc(alloc_size, SMP_CACHE_BYTES); if (!chunk) panic("%s: Failed to allocate %zu bytes\n", __func__, |