lkml.org 
[lkml]   [2011]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC/PATCH 6/7] x86, mm: Prepare zone_sizes_init() for unification
    Date
    Make 32-bit and 64-bit zone_sizes_init() identical in preparation for
    unification.

    Cc: Tejun Heo <tj@kernel.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: H. Peter Anvin <hpa@linux.intel.com>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: Pekka Enberg <penberg@kernel.org>
    ---
    arch/x86/mm/init_32.c | 4 ++++
    arch/x86/mm/init_64.c | 3 +++
    2 files changed, 7 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
    index 6101894..12274fb 100644
    --- a/arch/x86/mm/init_32.c
    +++ b/arch/x86/mm/init_32.c
    @@ -677,10 +677,14 @@ void __init initmem_init(void)
    static void __init zone_sizes_init(void)
    {
    unsigned long max_zone_pfns[MAX_NR_ZONES];
    +
    memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
    #ifdef CONFIG_ZONE_DMA
    max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;
    #endif
    +#ifdef CONFIG_ZONE_DMA32
    + max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
    +#endif
    max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
    #ifdef CONFIG_HIGHMEM
    max_zone_pfns[ZONE_HIGHMEM] = max_pfn;
    diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
    index f6b1f08..06c4360 100644
    --- a/arch/x86/mm/init_64.c
    +++ b/arch/x86/mm/init_64.c
    @@ -624,6 +624,9 @@ static void __init zone_sizes_init(void)
    max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
    #endif
    max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
    +#ifdef CONFIG_HIGHMEM
    + max_zone_pfns[ZONE_HIGHMEM] = max_pfn;
    +#endif

    free_area_init_nodes(max_zone_pfns);
    }
    --
    1.7.6.4


    \
     
     \ /
      Last update: 2011-10-28 16:25    [W:0.020 / U:153.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site