Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86/efi: Unexport add_efi_memmap variable

Browse Source 
This variable was accidentally exported, even though it's only used in
this compilation unit and only during initialization.

Remove the bogus export, make the variable static instead and mark it
as __initdata.

Fixes: 200001eb14 ("x86 boot: only pick up additional EFI memmap...")
Cc: Paul Jackson <pj@sgi.com>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Mathias Krause 2014-09-07 19:42:15 +02:00 committed by Matt Fleming
parent 24ffd84b60
commit 6092068547
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/efi.h
View File

@ -88,7 +88,6 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
#define efi_in_nmi() in_nmi() #define efi_in_nmi() in_nmi()
extern int add_efi_memmap;
extern struct efi_scratch efi_scratch; extern struct efi_scratch efi_scratch;
extern void efi_set_executable(efi_memory_desc_t *md, bool executable); extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
extern int efi_memblock_x86_reserve_range(void); extern int efi_memblock_x86_reserve_range(void);

4
arch/x86/platform/efi/efi.c
View File

@ -70,9 +70,7 @@ static efi_config_table_type_t arch_tables[] __initdata = {
u64 efi_setup; /* efi setup_data physical address */ u64 efi_setup; /* efi setup_data physical address */
int add_efi_memmap; static int add_efi_memmap __initdata;
EXPORT_SYMBOL(add_efi_memmap);
static int __init setup_add_efi_memmap(char *arg) static int __init setup_add_efi_memmap(char *arg)
{ {
add_efi_memmap = 1; add_efi_memmap = 1;