lkml.org 
[lkml]   [2008]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/16] x86: move parse_setup_data back to setup.c
    Date

    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

    ---
    arch/x86/kernel/setup.c | 25 +++++++++++++++++++++++++
    arch/x86/kernel/setup_percpu.c | 25 -------------------------
    2 files changed, 25 insertions(+), 25 deletions(-)

    Index: linux-2.6/arch/x86/kernel/setup.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/setup.c
    +++ linux-2.6/arch/x86/kernel/setup.c
    @@ -371,6 +371,31 @@ static void __init reserve_initrd(void)
    }
    #endif /* CONFIG_BLK_DEV_INITRD */

    +void __init parse_setup_data(void)
    +{
    + struct setup_data *data;
    + u64 pa_data;
    +
    + if (boot_params.hdr.version < 0x0209)
    + return;
    + pa_data = boot_params.hdr.setup_data;
    + while (pa_data) {
    + data = early_ioremap(pa_data, PAGE_SIZE);
    + switch (data->type) {
    + case SETUP_E820_EXT:
    + parse_e820_ext(data, pa_data);
    + break;
    + default:
    + break;
    + }
    +#ifndef CONFIG_DEBUG_BOOT_PARAMS
    + free_early(pa_data, pa_data+sizeof(*data)+data->len);
    +#endif
    + pa_data = data->next;
    + early_iounmap(data, PAGE_SIZE);
    + }
    +}
    +
    /*
    * Determine if we were loaded by an EFI loader. If so, then we have also been
    * passed the efi memmap, systab, etc., so we should use these data structures
    Index: linux-2.6/arch/x86/kernel/setup_percpu.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/setup_percpu.c
    +++ linux-2.6/arch/x86/kernel/setup_percpu.c
    @@ -214,31 +214,6 @@ void __init setup_per_cpu_areas(void)

    #endif

    -void __init parse_setup_data(void)
    -{
    - struct setup_data *data;
    - u64 pa_data;
    -
    - if (boot_params.hdr.version < 0x0209)
    - return;
    - pa_data = boot_params.hdr.setup_data;
    - while (pa_data) {
    - data = early_ioremap(pa_data, PAGE_SIZE);
    - switch (data->type) {
    - case SETUP_E820_EXT:
    - parse_e820_ext(data, pa_data);
    - break;
    - default:
    - break;
    - }
    -#ifndef CONFIG_DEBUG_BOOT_PARAMS
    - free_early(pa_data, pa_data+sizeof(*data)+data->len);
    -#endif
    - pa_data = data->next;
    - early_iounmap(data, PAGE_SIZE);
    - }
    -}
    -
    #ifdef X86_64_NUMA

    /*

    \
     
     \ /
      Last update: 2008-06-26 03:09    [W:0.031 / U:395.200 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site