aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2009-08-14 15:23:29 -0400
committerLen Brown <len.brown@intel.com>2009-08-28 19:57:34 -0400
commitefafc8b213e67ed148a5b53ade29ee7b48af907d (patch)
tree416ffc86b22dcb4a7825b7148d208ff52bdd50d3 /arch/x86/kernel/setup.c
parent13e82d023c4c3f13ab1e665cbb917a7ebba8935c (diff)
x86: add arch-specific SFI support
arch/x86/kernel/sfi.c serves the dual-purpose of supporting the SFI core with arch specific code, as well as a home for the arch-specific code that uses SFI. analogous to ACPI, drivers/sfi/Kconfig is pulled in by arch/x86/Kconfig Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> Cc: x86@kernel.org
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 63f32d220ef2..d784ea207606 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -27,6 +27,7 @@
27#include <linux/screen_info.h> 27#include <linux/screen_info.h>
28#include <linux/ioport.h> 28#include <linux/ioport.h>
29#include <linux/acpi.h> 29#include <linux/acpi.h>
30#include <linux/sfi.h>
30#include <linux/apm_bios.h> 31#include <linux/apm_bios.h>
31#include <linux/initrd.h> 32#include <linux/initrd.h>
32#include <linux/bootmem.h> 33#include <linux/bootmem.h>
@@ -990,6 +991,8 @@ void __init setup_arch(char **cmdline_p)
990 */ 991 */
991 acpi_boot_init(); 992 acpi_boot_init();
992 993
994 sfi_init();
995
993#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS) 996#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
994 /* 997 /*
995 * get boot-time SMP configuration: 998 * get boot-time SMP configuration: