Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758261AbZFWHOm (ORCPT ); Tue, 23 Jun 2009 03:14:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757926AbZFWHON (ORCPT ); Tue, 23 Jun 2009 03:14:13 -0400 Received: from vms173019pub.verizon.net ([206.46.173.19]:55159 "EHLO vms173019pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756965AbZFWHOL (ORCPT ); Tue, 23 Jun 2009 03:14:11 -0400 From: Len Brown To: sfi-devel@simplefirmware.org, linux-kernel@vger.kernel.org Cc: Feng Tang , Len Brown Subject: [PATCH 4/8] SFI: Hook boot-time initialization Date: Tue, 23 Jun 2009 03:14:02 -0400 Message-id: <049af54e14f6f070140927cb67602c186f93b26c.1245740912.git.len.brown@intel.com> X-Mailer: git-send-email 1.6.3.3.334.g916e1 In-reply-to: <1245741246-6503-1-git-send-email-lenb@kernel.org> References: <1245741246-6503-1-git-send-email-lenb@kernel.org> In-reply-to: <7425334c8329b15bec7cb4ecd0b17af042e97465.1245740912.git.len.brown@intel.com> References: <7425334c8329b15bec7cb4ecd0b17af042e97465.1245740912.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: 1535 Lines: 58 From: Feng Tang 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 b415843..e2e6794 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -952,6 +953,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 f1b9f0f..36333c7 100644 --- a/init/main.c +++ b/init/main.c @@ -65,6 +65,7 @@ #include #include #include +#include #include #include @@ -688,6 +689,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/