Messages in this thread Patch in this message |  | | From | Len Brown <> | Subject | [PATCH 5/8] SFI: Hook e820 memory map initialization | Date | Tue, 23 Jun 2009 03:14:03 -0400 |
| |
From: Feng Tang <feng.tang@intel.com>
Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> --- arch/x86/kernel/e820.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 0062813..f5f5ff2 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -20,6 +20,7 @@ #include <linux/pfn.h> #include <linux/suspend.h> #include <linux/firmware-map.h> +#include <linux/sfi.h> #include <asm/pgtable.h> #include <asm/page.h> @@ -1403,6 +1404,10 @@ char *__init default_machine_specific_memory_setup(void) < 0) { u64 mem_size; + /* if SFI mmap table exists, use SFI to setup e820 mmap */ + if (!sfi_init_memory_map()) + return "SFI"; + /* compare results from other methods and take the greater */ if (boot_params.alt_mem_k < boot_params.screen_info.ext_mem_k) { -- 1.6.0.6
|  |