Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

- #ifdef CONFIG_EFI around __efi_fpsimd_begin/end

- Assembly code alignment reduced to 4 bytes from 16

- Ensure the kernel is compiled for LP64 (there are some arm64
compilers around defaulting to ILP32)

- Fix arm_pmu_acpi memory leak on the error path

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
drivers/perf: arm_pmu_acpi: Release memory obtained by kasprintf
arm64: ensure the kernel is compiled for LP64
arm64: relax assembly code alignment from 16 byte to 4 byte
arm64: efi: Don't include EFI fpsimd save/restore code in non-EFI kernels

+12 -2
+5
arch/arm64/Makefile
··· 50 50 KBUILD_CFLAGS += $(call cc-option, -mpc-relative-literal-loads) 51 51 KBUILD_AFLAGS += $(lseinstr) $(brokengasinst) 52 52 53 + KBUILD_CFLAGS += $(call cc-option,-mabi=lp64) 54 + KBUILD_AFLAGS += $(call cc-option,-mabi=lp64) 55 + 53 56 ifeq ($(CONFIG_CPU_BIG_ENDIAN), y) 54 57 KBUILD_CPPFLAGS += -mbig-endian 55 58 CHECKFLAGS += -D__AARCH64EB__ 56 59 AS += -EB 57 60 LD += -EB 61 + LDFLAGS += -maarch64linuxb 58 62 UTS_MACHINE := aarch64_be 59 63 else 60 64 KBUILD_CPPFLAGS += -mlittle-endian 61 65 CHECKFLAGS += -D__AARCH64EL__ 62 66 AS += -EL 63 67 LD += -EL 68 + LDFLAGS += -maarch64linux 64 69 UTS_MACHINE := aarch64 65 70 endif 66 71
+2 -2
arch/arm64/include/asm/linkage.h
··· 1 1 #ifndef __ASM_LINKAGE_H 2 2 #define __ASM_LINKAGE_H 3 3 4 - #define __ALIGN .align 4 5 - #define __ALIGN_STR ".align 4" 4 + #define __ALIGN .align 2 5 + #define __ALIGN_STR ".align 2" 6 6 7 7 #endif
+4
arch/arm64/kernel/fpsimd.c
··· 321 321 } 322 322 EXPORT_SYMBOL(kernel_neon_end); 323 323 324 + #ifdef CONFIG_EFI 325 + 324 326 static DEFINE_PER_CPU(struct fpsimd_state, efi_fpsimd_state); 325 327 static DEFINE_PER_CPU(bool, efi_fpsimd_state_used); 326 328 ··· 371 369 else 372 370 kernel_neon_end(); 373 371 } 372 + 373 + #endif /* CONFIG_EFI */ 374 374 375 375 #endif /* CONFIG_KERNEL_MODE_NEON */ 376 376
+1
drivers/perf/arm_pmu_acpi.c
··· 235 235 ret = armpmu_register(pmu); 236 236 if (ret) { 237 237 pr_warn("Failed to register PMU for CPU%d\n", cpu); 238 + kfree(pmu->name); 238 239 return ret; 239 240 } 240 241 }