Adding efi_memory_setup() to be used to override the default memory_setup function when the EFI memory map should be used instead of a BIOS provided e820 map. Signed-off-by: Linn Crosetto <linn@xxxxxx> --- arch/x86/platform/efi/efi.c | 8 ++++++++ include/linux/efi.h | 1 + 2 files changed, 9 insertions(+) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 32da922..c2a660c 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -711,6 +711,14 @@ static int __init efi_runtime_init(void) return 0; } +char * __init efi_memory_setup(void) +{ + char *who = "EFI"; + efi_memmap_init(); + do_add_efi_memmap(); + return who; +} + void __init efi_init(void) { efi_char16_t *c16; diff --git a/include/linux/efi.h b/include/linux/efi.h index 5f8f176..977bbc7 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -567,6 +567,7 @@ efi_guid_unparse(efi_guid_t *guid, char *out) return out; } +extern char *efi_memory_setup(void); extern void efi_init (void); extern void *efi_get_pal_addr (void); extern void efi_map_pal_code (void); -- 1.7.11.3 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html