openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

efi: Kill __efistub_global 

Now that both arm and x86 are using the linker script to place the EFI
stub's global variables in the correct section, remove __efistub_global.

Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20200416151227.3360778-4-nivedita@alum.mit.edu
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Arvind Sankar 2020-04-16 11:12:27 -04:00 committed by Ard Biesheuvel
parent 26a92425f9
commit 544393707f
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/firmware/efi/libstub/efi-stub-helper.c
View File

@ -12,14 +12,13 @@
#include "efistub.h" #include "efistub.h"
static bool __efistub_global efi_nochunk; static bool efi_nochunk;
static bool __efistub_global efi_nokaslr; static bool efi_nokaslr;
static bool __efistub_global efi_noinitrd; static bool efi_noinitrd;
static bool __efistub_global efi_quiet; static bool efi_quiet;
static bool __efistub_global efi_novamap; static bool efi_novamap;
static bool __efistub_global efi_nosoftreserve; static bool efi_nosoftreserve;
static bool __efistub_global efi_disable_pci_dma = static bool efi_disable_pci_dma = IS_ENABLED(CONFIG_EFI_DISABLE_PCI_DMA);
IS_ENABLED(CONFIG_EFI_DISABLE_PCI_DMA);
bool __pure nochunk(void) bool __pure nochunk(void)
{ {

4
drivers/firmware/efi/libstub/efi-stub.c
View File

@ -36,9 +36,9 @@
#endif #endif
static u64 virtmap_base = EFI_RT_VIRTUAL_BASE; static u64 virtmap_base = EFI_RT_VIRTUAL_BASE;
static bool __efistub_global flat_va_mapping; static bool flat_va_mapping;
static efi_system_table_t *__efistub_global sys_table; static efi_system_table_t *sys_table;
__pure efi_system_table_t *efi_system_table(void) __pure efi_system_table_t *efi_system_table(void)
{ {

2
drivers/firmware/efi/libstub/efistub.h
View File

@ -25,8 +25,6 @@
#define EFI_ALLOC_ALIGN EFI_PAGE_SIZE #define EFI_ALLOC_ALIGN EFI_PAGE_SIZE
#endif #endif
#define __efistub_global
extern bool __pure nochunk(void); extern bool __pure nochunk(void);
extern bool __pure nokaslr(void); extern bool __pure nokaslr(void);
extern bool __pure noinitrd(void); extern bool __pure noinitrd(void);

2
drivers/firmware/efi/libstub/gop.c
View File

@ -32,7 +32,7 @@ static struct {
u8 depth; u8 depth;
} res; } res;
}; };
} cmdline __efistub_global = { .option = EFI_CMDLINE_NONE }; } cmdline = { .option = EFI_CMDLINE_NONE };
static bool parse_modenum(char *option, char **next) static bool parse_modenum(char *option, char **next)
{ {

2
drivers/firmware/efi/libstub/x86-stub.c
View File

@ -20,7 +20,7 @@
/* Maximum physical address for 64-bit kernel with 4-level paging */ /* Maximum physical address for 64-bit kernel with 4-level paging */
#define MAXMEM_X86_64_4LEVEL (1ull << 46) #define MAXMEM_X86_64_4LEVEL (1ull << 46)
static efi_system_table_t *sys_table __efistub_global; static efi_system_table_t *sys_table;
extern const bool efi_is64; extern const bool efi_is64;
extern u32 image_offset; extern u32 image_offset;