diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-13 19:54:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-13 19:54:50 +0100 |
| commit | af2a9c6a83a61bcaeb0fa4edc74762448926ef1c (patch) | |
| tree | bc8535e16fe7a6974b6588094ec5e0e259fb97d9 /arch | |
| parent | Merge tag 'hid-for-linus-2023121201' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | efi/x86: Avoid physical KASLR on older Dell systems (diff) | |
| download | linux-af2a9c6a83a61bcaeb0fa4edc74762448926ef1c.tar.xz linux-af2a9c6a83a61bcaeb0fa4edc74762448926ef1c.zip | |
Merge tag 'efi-urgent-for-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel:
- Deal with a regression in the recently refactored x86 EFI stub code
on older Dell systems by disabling randomization of the physical load
address
- Use the correct load address for relocatable Loongarch kernels
* tag 'efi-urgent-for-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi/x86: Avoid physical KASLR on older Dell systems
efi/loongarch: Use load address to calculate kernel entry address
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/loongarch/include/asm/efi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/loongarch/include/asm/efi.h b/arch/loongarch/include/asm/efi.h index 091897d40b03..91d81f9730ab 100644 --- a/arch/loongarch/include/asm/efi.h +++ b/arch/loongarch/include/asm/efi.h @@ -32,6 +32,6 @@ static inline unsigned long efi_get_kimg_min_align(void) #define EFI_KIMG_PREFERRED_ADDRESS PHYSADDR(VMLINUX_LOAD_ADDRESS) -unsigned long kernel_entry_address(void); +unsigned long kernel_entry_address(unsigned long kernel_addr); #endif /* _ASM_LOONGARCH_EFI_H */ |