提交 2c36be94 编写于 作者: M Ma Wupeng 提交者: Zheng Zengkai

efi: Fix efi_find_mirror redefine in x86

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4SK3S
CVE: NA

----------------------------------------------

Commit cc3d801f ("efi: Make efi_find_mirror() public") add
efi_find_mirror() defination into linux/efi.h, but forget to
drop this in arch/x86/include/asm/efi.h, kill it.

Fixes: cc3d801f ("efi: Make efi_find_mirror() public")
Signed-off-by: NMa Wupeng <mawupeng1@huawei.com>
Reviewed-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 80cefd92
...@@ -353,7 +353,6 @@ static inline bool efi_is_64bit(void) ...@@ -353,7 +353,6 @@ static inline bool efi_is_64bit(void)
extern bool efi_reboot_required(void); extern bool efi_reboot_required(void);
extern bool efi_is_table_address(unsigned long phys_addr); extern bool efi_is_table_address(unsigned long phys_addr);
extern void efi_find_mirror(void);
extern void efi_reserve_boot_services(void); extern void efi_reserve_boot_services(void);
#else #else
static inline void parse_efi_setup(u64 phys_addr, u32 data_len) {} static inline void parse_efi_setup(u64 phys_addr, u32 data_len) {}
...@@ -365,9 +364,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr) ...@@ -365,9 +364,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr)
{ {
return false; return false;
} }
static inline void efi_find_mirror(void)
{
}
static inline void efi_reserve_boot_services(void) static inline void efi_reserve_boot_services(void)
{ {
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册