Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759381AbZGHEQl (ORCPT ); Wed, 8 Jul 2009 00:16:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751408AbZGHEOk (ORCPT ); Wed, 8 Jul 2009 00:14:40 -0400 Received: from vms173009pub.verizon.net ([206.46.173.9]:19783 "EHLO vms173009pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757710AbZGHEOZ (ORCPT ); Wed, 8 Jul 2009 00:14:25 -0400 From: Len Brown To: x86@kernel.org, sfi-devel@simplefirmware.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Feng Tang , Len Brown Subject: [PATCH 08/12] SFI, x86: hook e820() for memory map initialization Date: Wed, 08 Jul 2009 00:13:54 -0400 Message-id: <5bf6b3c7c08a76ea8dc52e9e07728c2958938952.1247025117.git.len.brown@intel.com> X-Mailer: git-send-email 1.6.3.3.385.g60647 In-reply-to: <1247026438-20891-1-git-send-email-lenb@kernel.org> References: <1247026438-20891-1-git-send-email-lenb@kernel.org> In-reply-to: <8e4a93858bce74ed3080dd607aa471023f1a2737.1247025117.git.len.brown@intel.com> References: <8e4a93858bce74ed3080dd607aa471023f1a2737.1247025117.git.len.brown@intel.com> X-Patchwork-Hint: ignore Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1173 Lines: 39 From: Feng Tang Signed-off-by: Feng Tang Signed-off-by: Len Brown --- 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 c4ca89d..e399d0e 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -1437,6 +1438,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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/