From: Frederik Deweerdt Compiling on i386 without the CONFIG_EFI enabled complains because it can't find efi_init_e820_map prototype: arch/i386/kernel/setup.c: In function `setup_arch': arch/i386/kernel/setup.c:1560: warning: implicit declaration of function `efi_init_e820_map' The attached corrects this, and also makes efi_init_e820_map static. Signed-off-by: Frederik Deweerdt Cc: Edgar Hucek Signed-off-by: Andrew Morton --- arch/i386/kernel/setup.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN arch/i386/kernel/setup.c~add-efi-e820-memory-mapping-on-x86-fix-2 arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c~add-efi-e820-memory-mapping-on-x86-fix-2 +++ a/arch/i386/kernel/setup.c @@ -1322,7 +1322,7 @@ static void set_mca_bus(int x) { } /* * Make a e820 memory map */ -void __init efi_init_e820_map(void) +static void __init efi_init_e820_map(void) { efi_memory_desc_t *md; unsigned long long start = 0; @@ -1374,7 +1374,9 @@ void __init efi_init_e820_map(void) } } } -#endif +#else +static void __init efi_init_e820_map(void) { } +#endif /* CONFIG_EFI */ /* * Determine if we were loaded by an EFI loader. If so, then we have also been _