Commit ca1fdab7 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 0273fd42 aa6d1ed1
...@@ -323,7 +323,7 @@ static inline u32 efi64_convert_status(efi_status_t status) ...@@ -323,7 +323,7 @@ static inline u32 efi64_convert_status(efi_status_t status)
#define __efi64_argmap_get_memory_space_descriptor(phys, desc) \ #define __efi64_argmap_get_memory_space_descriptor(phys, desc) \
(__efi64_split(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)) (__efi64_split(phys), __efi64_split(size), __efi64_split(flags))
/* /*
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include <linux/sysfb.h> #include <linux/sysfb.h>
#include <video/vga.h> #include <video/vga.h>
#include <asm/efi.h>
enum { enum {
OVERRIDE_NONE = 0x0, OVERRIDE_NONE = 0x0,
OVERRIDE_BASE = 0x1, OVERRIDE_BASE = 0x1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment