[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <d3bcd312f3ebabd86c79fbd53983021e4cd7b56a.1245740912.git.len.brown@intel.com>
Date: Tue, 23 Jun 2009 03:14:03 -0400
From: Len Brown <lenb@...nel.org>
To: sfi-devel@...plefirmware.org, linux-kernel@...r.kernel.org
Cc: Feng Tang <feng.tang@...el.com>, Len Brown <len.brown@...el.com>
Subject: [PATCH 5/8] SFI: Hook e820 memory map initialization
From: Feng Tang <feng.tang@...el.com>
Signed-off-by: Feng Tang <feng.tang@...el.com>
Signed-off-by: Len Brown <len.brown@...el.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists