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
Unified · Split
| @@ -323,7 +323,7 @@ static inline u32 efi64_convert_status(efi_status_t status) · 322 unmodified lines | |||
| 323 | #define __efi64_argmap_get_memory_space_descriptor(phys, desc) \ | 323 | #define __efi64_argmap_get_memory_space_descriptor(phys, desc) \ |
| 324 | (__efi64_split(phys), (desc)) | 324 | (__efi64_split(phys), (desc)) |
| 325 | 325 | ||
| 326 | #define __efi64_argmap_set_memory_space_descriptor(phys, size, flags) \ | 326 | #define __efi64_argmap_set_memory_space_attributes(phys, size, flags) \ |
| 327 | (__efi64_split(phys), __efi64_split(size), __efi64_split(flags)) | 327 | (__efi64_split(phys), __efi64_split(size), __efi64_split(flags)) |
| 328 | 328 | ||
| 329 | /* | 329 | /* |
| @@ -26,8 +26,6 @@ · 25 unmodified lines | |||
| 26 | #include <linux/sysfb.h> | 26 | #include <linux/sysfb.h> |
| 27 | #include <video/vga.h> | 27 | #include <video/vga.h> |
| 28 | 28 | ||
| 29 | #include <asm/efi.h> | ||
| 30 | |||
| 31 | enum { | 29 | enum { |
| 32 | OVERRIDE_NONE = 0x0, | 30 | OVERRIDE_NONE = 0x0, |
| 33 | OVERRIDE_BASE = 0x1, | 31 | OVERRIDE_BASE = 0x1, |