Skip to content

Commit

Permalink
x86/efi: Unexport add_efi_memmap variable
Browse files Browse the repository at this point in the history
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: 200001e ("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>
  • Loading branch information
Mathias Krause authored and Matt Fleming committed Oct 3, 2014
1 parent 24ffd84 commit 6092068
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion arch/x86/include/asm/efi.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,

#define efi_in_nmi() in_nmi()

extern int add_efi_memmap;
extern struct efi_scratch efi_scratch;
extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
extern int efi_memblock_x86_reserve_range(void);
Expand Down
4 changes: 1 addition & 3 deletions arch/x86/platform/efi/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ static efi_config_table_type_t arch_tables[] __initdata = {

u64 efi_setup; /* efi setup_data physical address */

int add_efi_memmap;
EXPORT_SYMBOL(add_efi_memmap);

static int add_efi_memmap __initdata;
static int __init setup_add_efi_memmap(char *arg)
{
add_efi_memmap = 1;
Expand Down

0 comments on commit 6092068

Please sign in to comment.