lkml.org 
[lkml]   [2013]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 19/22] x86, mm: Parse numa info early
    Date
    Parsing numa info has been separated to two functions now.

    early_initmem_info() only parse info in numa_meminfo and
    nodes_parsed. still keep numaq, acpi_numa, amd_numa, dummy
    fall back sequence working.

    SLIT and numa emulation handling are still left in initmem_init().

    Call early_initmem_init before init_mem_mapping() to prepare
    to use numa_info with it.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: Pekka Enberg <penberg@kernel.org>
    Cc: Jacob Shin <jacob.shin@amd.com>
    ---
    arch/x86/kernel/setup.c | 24 ++++++++++--------------
    1 file changed, 10 insertions(+), 14 deletions(-)

    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index d40e16e..6ef3fa2 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -1098,13 +1098,21 @@ void __init setup_arch(char **cmdline_p)
    trim_platform_memory_ranges();
    trim_low_memory_range();

    + /*
    + * Parse the ACPI tables for possible boot-time SMP configuration.
    + */
    + acpi_initrd_override_copy();
    + acpi_boot_table_init();
    + early_acpi_boot_init();
    + early_initmem_init();
    init_mem_mapping();
    -
    + memblock.current_limit = get_max_mapped();
    early_trap_pf_init();

    + reserve_initrd();
    +
    setup_real_mode();

    - memblock.current_limit = get_max_mapped();
    dma_contiguous_reserve(0);

    /*
    @@ -1118,24 +1126,12 @@ void __init setup_arch(char **cmdline_p)
    /* Allocate bigger log buffer */
    setup_log_buf(1);

    - acpi_initrd_override_copy();
    -
    - reserve_initrd();
    -
    reserve_crashkernel();

    vsmp_init();

    io_delay_init();

    - /*
    - * Parse the ACPI tables for possible boot-time SMP configuration.
    - */
    - acpi_boot_table_init();
    -
    - early_acpi_boot_init();
    -
    - early_initmem_init();
    initmem_init();
    memblock_find_dma_reserve();

    --
    1.8.1.4


    \
     
     \ /
      Last update: 2013-04-05 02:21    [W:4.119 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site