diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-29 10:27:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-29 10:27:49 -0800 |
| commit | fbb3c22f908accfd6fd34b1dbdd304fc2609c78a (patch) | |
| tree | 0fef34e8fc522afedc20fe0ac611262ffd8edfb7 /arch/sparc/kernel | |
| parent | Merge tag 'powerpc-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | sparc/vdso: Add helper function for 64-bit right shift on 32-bit target (diff) | |
| download | linux-fbb3c22f908accfd6fd34b1dbdd304fc2609c78a.tar.gz linux-fbb3c22f908accfd6fd34b1dbdd304fc2609c78a.zip | |
Merge tag 'sparc-for-6.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc
Pull sparc updates from Andreas Larsson:
- Make sparc64 compilable with clang
- Replace one-element array with flexible array member
* tag 'sparc-for-6.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc:
sparc/vdso: Add helper function for 64-bit right shift on 32-bit target
sparc: Replace one-element array with flexible array member
sparc/build: Add SPARC target flags for compiling with clang
sparc/build: Put usage of -fcall-used* flags behind cc-option
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/smp_64.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index e40c395db202..5cbd6ed5ef6f 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c @@ -297,9 +297,7 @@ static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg, unsigned long hv_err; int i; - hdesc = kzalloc(sizeof(*hdesc) + - (sizeof(struct hvtramp_mapping) * - num_kernel_image_mappings - 1), + hdesc = kzalloc(struct_size(hdesc, maps, num_kernel_image_mappings), GFP_KERNEL); if (!hdesc) { printk(KERN_ERR "ldom_startcpu_cpuid: Cannot allocate " |