lkml.org 
[lkml]   [2011]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] bootmem: Move contig_page_data definition to bootmem.c/nobootmem.c
    From e782ab421bbba1912c87934bd0e8998630736418 Mon Sep 17 00:00:00 2001
    From: Yinghai Lu <yinghai@kernel.org>
    Date: Thu, 24 Feb 2011 14:43:06 +0100

    Now that bootmem.c and nobootmem.c are separate, it's cleaner to
    define contig_page_data in each file than in page_alloc.c with #ifdef.
    Move it.

    This patch doesn't introduce any behavior change.

    -v2: According to Andrew, fixed the struct layout.
    -tj: Updated commit description.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Tejun Heo <tj@kernel.org>
    ---
    Committed to misc:x86-numa with description updates. Thanks.

    mm/bootmem.c | 7 +++++++
    mm/nobootmem.c | 5 +++++
    mm/page_alloc.c | 9 ---------
    3 files changed, 12 insertions(+), 9 deletions(-)

    diff --git a/mm/bootmem.c b/mm/bootmem.c
    index 4403e2f..07aeb89 100644
    --- a/mm/bootmem.c
    +++ b/mm/bootmem.c
    @@ -23,6 +23,13 @@

    #include "internal.h"

    +#ifndef CONFIG_NEED_MULTIPLE_NODES
    +struct pglist_data __refdata contig_page_data = {
    + .bdata = &bootmem_node_data[0]
    +};
    +EXPORT_SYMBOL(contig_page_data);
    +#endif
    +
    unsigned long max_low_pfn;
    unsigned long min_low_pfn;
    unsigned long max_pfn;
    diff --git a/mm/nobootmem.c b/mm/nobootmem.c
    index f220b8d..6a018e4 100644
    --- a/mm/nobootmem.c
    +++ b/mm/nobootmem.c
    @@ -23,6 +23,11 @@

    #include "internal.h"

    +#ifndef CONFIG_NEED_MULTIPLE_NODES
    +struct pglist_data __refdata contig_page_data;
    +EXPORT_SYMBOL(contig_page_data);
    +#endif
    +
    unsigned long max_low_pfn;
    unsigned long min_low_pfn;
    unsigned long max_pfn;
    diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    index 887ce3b..a243a7f 100644
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -4841,15 +4841,6 @@ void __init set_dma_reserve(unsigned long new_dma_reserve)
    dma_reserve = new_dma_reserve;
    }

    -#ifndef CONFIG_NEED_MULTIPLE_NODES
    -struct pglist_data __refdata contig_page_data = {
    -#ifndef CONFIG_NO_BOOTMEM
    - .bdata = &bootmem_node_data[0]
    -#endif
    - };
    -EXPORT_SYMBOL(contig_page_data);
    -#endif
    -
    void __init free_area_init(unsigned long *zones_size)
    {
    free_area_init_node(0, zones_size,
    --
    1.7.1


    \
     
     \ /
      Last update: 2011-02-24 15:01    [W:0.024 / U:0.548 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site