The patch titled
fix "efi_init_e820_map undefined" warning
has been added to the -mm tree. Its filename is
add-efi-e820-memory-mapping-on-x86-fix-2.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix "efi_init_e820_map undefined" warning
From: Frederik Deweerdt <deweerdt@xxxxxxx>
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 <frederik.deweerdt@xxxxxxxxx>
Cc: Edgar Hucek <hostmaster@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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
@@ -1433,7 +1433,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;
@@ -1485,7 +1485,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
_
Patches currently in -mm which might be from deweerdt@xxxxxxx are
add-efi-e820-memory-mapping-on-x86-fix-2.patch
mdacon-fix-__init-section-warnings.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
