Commit a8ad9a24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-urgent-for-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi 

Pull EFI fix from Ard Biesheuvel:
 "Another EFI fix for v5.16:

   - Prevent missing prototype warning from breaking the build under
     CONFIG_WERROR=y"

* tag 'efi-urgent-for-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: Move efifb_setup_from_dmi() prototype from arch headers
parents fc74e0a4 4bc5e64e

arch/arm/include/asm/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


#ifdef CONFIG_EFI

void efi_init(void);

extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);



int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);

int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);

arch/arm64/include/asm/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#ifdef CONFIG_EFI

extern void efi_init(void);

extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);

#else

#define efi_init()

#endif

arch/riscv/include/asm/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#ifdef CONFIG_EFI

extern void efi_init(void);

extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);

#else

#define efi_init()

#endif

arch/x86/include/asm/efi.h

+0 −2
Original line number Diff line number Diff line
@@ -197,8 +197,6 @@ static inline bool efi_runtime_supported(void) 


extern void parse_efi_setup(u64 phys_addr, u32 data_len);



extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);



extern void efi_thunk_runtime_setup(void);

efi_status_t efi_set_virtual_address_map(unsigned long memory_map_size,

					 unsigned long descriptor_size,

include/linux/efi.h

+6 −0
Original line number Diff line number Diff line
@@ -1283,4 +1283,10 @@ static inline struct efi_mokvar_table_entry *efi_mokvar_entry_find( 
}

#endif



#ifdef CONFIG_SYSFB

extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);

#else

static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt) { }

#endif



#endif /* _LINUX_EFI_H */