Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759534AbZGHERZ (ORCPT ); Wed, 8 Jul 2009 00:17:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758448AbZGHEPJ (ORCPT ); Wed, 8 Jul 2009 00:15:09 -0400 Received: from vms173015pub.verizon.net ([206.46.173.15]:42823 "EHLO vms173015pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758272AbZGHEPG (ORCPT ); Wed, 8 Jul 2009 00:15:06 -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 12/12] SFI: add boot-time initialization hooks Date: Wed, 08 Jul 2009 00:13:58 -0400 Message-id: <7d8801c4e11f26a68fca70798dc40d5f405b4be2.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: 1752 Lines: 65 From: Feng Tang There are two SFI boot-time hooks: sfi_init() maps the SYST using early_ioremap() and validates all the tables. sfi_init_late() re-maps SYST with ioremap(), and initializes the ACPI extension, if present. Signed-off-by: Feng Tang Signed-off-by: Len Brown --- arch/x86/kernel/setup.c | 3 +++ init/main.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index de2cab1..94ad296 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -977,6 +978,8 @@ void __init setup_arch(char **cmdline_p) */ acpi_boot_init(); + sfi_init(); + #if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS) /* * get boot-time SMP configuration: diff --git a/init/main.c b/init/main.c index 2c5ade7..d32a1ff 100644 --- a/init/main.c +++ b/init/main.c @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -712,6 +713,7 @@ asmlinkage void __init start_kernel(void) check_bugs(); acpi_early_init(); /* before LAPIC and SMP init */ + sfi_init_late(); ftrace_init(); -- 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/