summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-06-21 20:20:11 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-06-21 20:20:11 +0300
commitca1fdab7fd27eb069df1384b2850dcd0c2bebe8d (patch)
treeb43a92bd59ea3a0f6106031a95758e123bed5770 /arch
parent0273fd423b2fe10af96ff713273137c63a7736c0 (diff)
parentaa6d1ed107eba26f49933216cffe797253914132 (diff)
downloadlinux-ca1fdab7fd27eb069df1384b2850dcd0c2bebe8d.tar.xz
Merge tag 'efi-urgent-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel: - remove pointless include of asm/efi.h, which does not exist on ia64 - fix DXE service marshalling prototype for mixed mode * tag 'efi-urgent-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: efi/x86: libstub: Fix typo in __efi64_argmap* name efi: sysfb_efi: remove unnecessary <asm/efi.h> include
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/efi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 71943dce691e..9636742a80f2 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -323,7 +323,7 @@ static inline u32 efi64_convert_status(efi_status_t status)
#define __efi64_argmap_get_memory_space_descriptor(phys, desc) \
(__efi64_split(phys), (desc))
-#define __efi64_argmap_set_memory_space_descriptor(phys, size, flags) \
+#define __efi64_argmap_set_memory_space_attributes(phys, size, flags) \
(__efi64_split(phys), __efi64_split(size), __efi64_split(flags))
/*