lkml.org 
[lkml]   [2008]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 4/4] mm: Unexport __alloc_bootmem_core()
    This function has no external callers, so unexport it.  Also fix its
    naming inconsistency.

    Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
    CC: Ingo Molnar <mingo@elte.hu>
    ---

    It could be argued that all bootmem alloc function names begin with
    underscores. But I chose to `no _core function names begin with
    underscores' :)

    Index: linux-2.6/include/linux/bootmem.h
    ===================================================================
    --- linux-2.6.orig/include/linux/bootmem.h
    +++ linux-2.6/include/linux/bootmem.h
    @@ -56,11 +56,6 @@ extern void *__alloc_bootmem_low_node(pg
    unsigned long size,
    unsigned long align,
    unsigned long goal);
    -extern void *__alloc_bootmem_core(struct bootmem_data *bdata,
    - unsigned long size,
    - unsigned long align,
    - unsigned long goal,
    - unsigned long limit);

    /*
    * flags for reserve_bootmem (also if CONFIG_HAVE_ARCH_BOOTMEM_NODE,
    Index: linux-2.6/mm/bootmem.c
    ===================================================================
    --- linux-2.6.orig/mm/bootmem.c
    +++ linux-2.6/mm/bootmem.c
    @@ -233,9 +233,9 @@ static void __init free_bootmem_core(boo
    *
    * NOTE: This function is _not_ reentrant.
    */
    -void * __init
    -__alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
    - unsigned long align, unsigned long goal, unsigned long limit)
    +static void * __init
    +alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
    + unsigned long align, unsigned long goal, unsigned long limit)
    {
    unsigned long areasize, preferred;
    unsigned long i, start = 0, incr, eidx, end_pfn;
    @@ -244,7 +244,7 @@ __alloc_bootmem_core(struct bootmem_data
    void *node_bootmem_map;

    if (!size) {
    - printk("__alloc_bootmem_core(): zero-sized request\n");
    + printk("alloc_bootmem_core(): zero-sized request\n");
    BUG();
    }
    BUG_ON(align & (align-1));
    @@ -509,7 +509,7 @@ void * __init __alloc_bootmem_nopanic(un
    void *ptr;

    list_for_each_entry(bdata, &bdata_list, list) {
    - ptr = __alloc_bootmem_core(bdata, size, align, goal, 0);
    + ptr = alloc_bootmem_core(bdata, size, align, goal, 0);
    if (ptr)
    return ptr;
    }
    @@ -537,7 +537,7 @@ void * __init __alloc_bootmem_node(pg_da
    {
    void *ptr;

    - ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);
    + ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);
    if (ptr)
    return ptr;

    @@ -556,8 +556,8 @@ void * __init alloc_bootmem_section(unsi
    goal = PFN_PHYS(pfn);
    limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1;
    pgdat = NODE_DATA(early_pfn_to_nid(pfn));
    - ptr = __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal,
    - limit);
    + ptr = alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal,
    + limit);

    if (!ptr)
    return NULL;
    @@ -586,8 +586,8 @@ void * __init __alloc_bootmem_low(unsign
    void *ptr;

    list_for_each_entry(bdata, &bdata_list, list) {
    - ptr = __alloc_bootmem_core(bdata, size, align, goal,
    - ARCH_LOW_ADDRESS_LIMIT);
    + ptr = alloc_bootmem_core(bdata, size, align, goal,
    + ARCH_LOW_ADDRESS_LIMIT);
    if (ptr)
    return ptr;
    }
    @@ -603,6 +603,6 @@ void * __init __alloc_bootmem_low(unsign
    void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size,
    unsigned long align, unsigned long goal)
    {
    - return __alloc_bootmem_core(pgdat->bdata, size, align, goal,
    - ARCH_LOW_ADDRESS_LIMIT);
    + return alloc_bootmem_core(pgdat->bdata, size, align, goal,
    + ARCH_LOW_ADDRESS_LIMIT);
    }
    --


    \
     
     \ /
      Last update: 2008-04-30 19:57    [W:0.027 / U:0.832 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site