lkml.org 
[lkml]   [2010]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 23/38] x86: make 32bit support NO_BOOTMEM
    let's make 32bit consistent with 64bit

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/Kconfig | 1 -
    arch/x86/kernel/early_res.c | 3 +++
    arch/x86/mm/init_32.c | 6 ++++++
    arch/x86/mm/numa_32.c | 3 +++
    4 files changed, 12 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 80a2a10..90467c9 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -571,7 +571,6 @@ config PARAVIRT_DEBUG
    config NO_BOOTMEM
    default y
    bool "Disable Bootmem code"
    - depends on X86_64
    ---help---
    use early_res directly instead of bootmem before slab is ready.

    diff --git a/arch/x86/kernel/early_res.c b/arch/x86/kernel/early_res.c
    index 52804e9..38a0c61 100644
    --- a/arch/x86/kernel/early_res.c
    +++ b/arch/x86/kernel/early_res.c
    @@ -354,6 +354,9 @@ int __init get_free_all_memory_range(struct range **rangep, int nodeid)

    /* need to go over early_node_map to find out good range for node */
    nr_range = add_from_early_node_map(range, count, nr_range, nodeid);
    +#ifdef CONFIG_X86_32
    + subtract_range(range, count, max_low_pfn, -1UL);
    +#endif
    subtract_early_res(range, count);
    nr_range = clean_sort_range(range, count);

    diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
    index 2dccde0..262867a 100644
    --- a/arch/x86/mm/init_32.c
    +++ b/arch/x86/mm/init_32.c
    @@ -748,6 +748,7 @@ static void __init zone_sizes_init(void)
    free_area_init_nodes(max_zone_pfns);
    }

    +#ifndef CONFIG_NO_BOOTMEM
    static unsigned long __init setup_node_bootmem(int nodeid,
    unsigned long start_pfn,
    unsigned long end_pfn,
    @@ -767,9 +768,11 @@ static unsigned long __init setup_node_bootmem(int nodeid,

    return bootmap + bootmap_size;
    }
    +#endif

    void __init setup_bootmem_allocator(void)
    {
    +#ifndef CONFIG_NO_BOOTMEM
    int nodeid;
    unsigned long bootmap_size, bootmap;
    /*
    @@ -781,11 +784,13 @@ void __init setup_bootmem_allocator(void)
    if (bootmap == -1L)
    panic("Cannot find bootmem map of size %ld\n", bootmap_size);
    reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP");
    +#endif

    printk(KERN_INFO " mapped low ram: 0 - %08lx\n",
    max_pfn_mapped<<PAGE_SHIFT);
    printk(KERN_INFO " low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT);

    +#ifndef CONFIG_NO_BOOTMEM
    for_each_online_node(nodeid) {
    unsigned long start_pfn, end_pfn;

    @@ -803,6 +808,7 @@ void __init setup_bootmem_allocator(void)
    bootmap = setup_node_bootmem(nodeid, start_pfn, end_pfn,
    bootmap);
    }
    +#endif

    after_bootmem = 1;
    }
    diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
    index b20760c..809baaa 100644
    --- a/arch/x86/mm/numa_32.c
    +++ b/arch/x86/mm/numa_32.c
    @@ -418,7 +418,10 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,

    for_each_online_node(nid) {
    memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
    + NODE_DATA(nid)->node_id = nid;
    +#ifndef CONFIG_NO_BOOTMEM
    NODE_DATA(nid)->bdata = &bootmem_node_data[nid];
    +#endif
    }

    setup_bootmem_allocator();
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-01-22 10:35    [W:0.028 / U:123.404 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site