diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-06 15:51:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-06 15:51:56 -0700 |
| commit | 46e80e6c3d456aed2f4c261425ff737bf82ce7bf (patch) | |
| tree | 279a502b13f0518147ee5259d62034bc37159430 /arch/x86/kernel | |
| parent | 82ac4043cac5d75d8cda79bc8a095f8306f35c75 (diff) | |
| parent | 15854edd193ae5d9daf8f50ce5f9f1724cebe344 (diff) | |
| download | linux-46e80e6c3d456aed2f4c261425ff737bf82ce7bf.tar.bz2 | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"A handful of cleanups: dma-ops cleanups, missing boot time kcalloc()
check, a Sparse fix and use struct_size() to simplify a vzalloc()
call"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/pci: Clean up usage of X86_DEV_DMA_OPS
x86/Kconfig: Remove the unused X86_DMA_REMAP KConfig symbol
x86/kexec/crash: Use struct_size() in vzalloc()
x86/mm/tlb: Define LOADED_MM_SWITCHING with pointer-sized number
x86/platform/uv: Fix missing checks of kcalloc() return values
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/crash.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 17ffc869cab8..a96ca8584803 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -204,8 +204,7 @@ static struct crash_mem *fill_up_crash_elf_data(void) * another range split. So add extra two slots here. */ nr_ranges += 2; - cmem = vzalloc(sizeof(struct crash_mem) + - sizeof(struct crash_mem_range) * nr_ranges); + cmem = vzalloc(struct_size(cmem, ranges, nr_ranges)); if (!cmem) return NULL; |