lkml.org 
[lkml]   [2009]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/8] SFI: Hook boot-time initialization
    Date
    From: Feng Tang <feng.tang@intel.com>

    Signed-off-by: Feng Tang <feng.tang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    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 <linux/screen_info.h>
    #include <linux/ioport.h>
    #include <linux/acpi.h>
    +#include <linux/sfi.h>
    #include <linux/apm_bios.h>
    #include <linux/initrd.h>
    #include <linux/bootmem.h>
    @@ -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 <linux/idr.h>
    #include <linux/ftrace.h>
    #include <linux/async.h>
    +#include <linux/sfi.h>
    #include <trace/boot.h>

    #include <asm/io.h>
    @@ -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


    \
     
     \ /
      Last update: 2009-06-23 09:19    [W:0.021 / U:1.648 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site