Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d9af767 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c17c0204 a88dc7ba

arch/arm64/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -50,17 +50,22 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables 
KBUILD_CFLAGS	+= $(call cc-option, -mpc-relative-literal-loads)

KBUILD_AFLAGS	+= $(lseinstr) $(brokengasinst)



KBUILD_CFLAGS	+= $(call cc-option,-mabi=lp64)

KBUILD_AFLAGS	+= $(call cc-option,-mabi=lp64)



ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)

KBUILD_CPPFLAGS	+= -mbig-endian

CHECKFLAGS	+= -D__AARCH64EB__

AS		+= -EB

LD		+= -EB

LDFLAGS		+= -maarch64linuxb

UTS_MACHINE	:= aarch64_be

else

KBUILD_CPPFLAGS	+= -mlittle-endian

CHECKFLAGS	+= -D__AARCH64EL__

AS		+= -EL

LD		+= -EL

LDFLAGS		+= -maarch64linux

UTS_MACHINE	:= aarch64

endif

arch/arm64/include/asm/linkage.h

+2 −2
Original line number Diff line number Diff line 
#ifndef __ASM_LINKAGE_H

#define __ASM_LINKAGE_H



#define __ALIGN		.align 4

#define __ALIGN_STR	".align 4"

#define __ALIGN		.align 2

#define __ALIGN_STR	".align 2"



#endif

arch/arm64/kernel/fpsimd.c

+4 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ void kernel_neon_end(void) 
}

EXPORT_SYMBOL(kernel_neon_end);



#ifdef CONFIG_EFI



static DEFINE_PER_CPU(struct fpsimd_state, efi_fpsimd_state);

static DEFINE_PER_CPU(bool, efi_fpsimd_state_used);
@@ -370,6 +372,8 @@ void __efi_fpsimd_end(void) 
		kernel_neon_end();

}



#endif /* CONFIG_EFI */



#endif /* CONFIG_KERNEL_MODE_NEON */



#ifdef CONFIG_CPU_PM

drivers/perf/arm_pmu_acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ int arm_pmu_acpi_probe(armpmu_init_fn init_fn) 
		ret = armpmu_register(pmu);

		if (ret) {

			pr_warn("Failed to register PMU for CPU%d\n", cpu);

			kfree(pmu->name);

			return ret;

		}

	}