lkml.org 
[lkml]   [2008]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] x86_64: cleanup setup_node_zones called by paging_init v3
    [PATCH] x86_64: cleanup setup_node_zones called by paging_init v3

    setup_node_zones calcuates some variables but only use them when FLAT_NODE_MEM_MAP is set

    so change the MACRO postion to avoid calculating.

    also change it to static, rename it to flat_setup_node_zones

    Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>

    Index: linux-2.6/arch/x86/mm/numa_64.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/mm/numa_64.c
    +++ linux-2.6/arch/x86/mm/numa_64.c
    @@ -229,8 +229,9 @@ void __init setup_node_bootmem(int nodei
    node_set_online(nodeid);
    }

    +#ifdef CONFIG_FLAT_NODE_MEM_MAP
    /* Initialize final allocator for a zone */
    -void __init setup_node_zones(int nodeid)
    +static void __init flat_setup_node_zones(int nodeid)
    {
    unsigned long start_pfn, end_pfn, memmapsize, limit;

    @@ -244,14 +245,16 @@ void __init setup_node_zones(int nodeid)
    memory. */
    memmapsize = sizeof(struct page) * (end_pfn-start_pfn);
    limit = end_pfn << PAGE_SHIFT;
    -#ifdef CONFIG_FLAT_NODE_MEM_MAP
    +
    NODE_DATA(nodeid)->node_mem_map =
    __alloc_bootmem_core(NODE_DATA(nodeid)->bdata,
    memmapsize, SMP_CACHE_BYTES,
    round_down(limit - memmapsize, PAGE_SIZE),
    limit);
    +}
    +#else
    +#define flat_setup_node_zones(i) do {} while (0)
    #endif
    -}

    void __init numa_init_array(void)
    {
    @@ -571,7 +574,7 @@ void __init paging_init(void)
    sparse_init();

    for_each_online_node(i) {
    - setup_node_zones(i);
    + flat_setup_node_zones(i);
    }

    free_area_init_nodes(max_zone_pfns);

    \
     
     \ /
      Last update: 2008-01-09 21:33    [W:0.039 / U:0.404 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site