summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-01-13 19:37:10 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-01-13 19:37:10 +0300
commit0bf913e07b377cfc288cfe488ca30b7d67059d8a (patch)
tree9121ef189b0d11e16d4767ecc8d2a97ae9d86906 /arch
parent40d92fc4fa81a93b4659b98512dcb9d0ccd94cfd (diff)
parentd3f450533bbcb6dd4d7d59cadc9b61b7321e4ac1 (diff)
downloadlinux-0bf913e07b377cfc288cfe488ca30b7d67059d8a.tar.xz
Merge tag 'efi-fixes-for-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel: - avoid a potential crash on the efi_subsys_init() error path - use more appropriate error code for runtime services calls issued after a crash in the firmware occurred - avoid READ_ONCE() for accessing firmware tables that may appear misaligned in memory * tag 'efi-fixes-for-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: efi: tpm: Avoid READ_ONCE() for accessing the event log efi: rt-wrapper: Add missing include efi: fix userspace infinite retry read efivars after EFI runtime services page fault efi: fix NULL-deref in init error path
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/efi-rt-wrapper.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/efi-rt-wrapper.S b/arch/arm64/kernel/efi-rt-wrapper.S
index a00886410537..d872d18101d8 100644
--- a/arch/arm64/kernel/efi-rt-wrapper.S
+++ b/arch/arm64/kernel/efi-rt-wrapper.S
@@ -4,6 +4,7 @@
*/
#include <linux/linkage.h>
+#include <asm/assembler.h>
SYM_FUNC_START(__efi_rt_asm_wrapper)
stp x29, x30, [sp, #-112]!