lkml.org 
[lkml]   [2009]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/10] bootmem: reorder interface functions and add a missing one
    Date
    Impact: cleanup and addition of missing interface wrapper

    The interface functions in bootmem.h was ordered in not so orderly
    manner. Reorder them such that

    * functions allocating the same area group together -
    ie. alloc_bootmem group and alloc_bootmem_low group.

    * functions w/o node parameter come before the ones w/ node parameter.

    * nopanic variants are immediately below their panicky counterparts.

    While at it, add alloc_bootmem_pages_node_nopanic() which was missing.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Johannes Weiner <hannes@saeurebad.de>
    ---
    include/linux/bootmem.h | 30 +++++++++++++++++-------------
    1 files changed, 17 insertions(+), 13 deletions(-)

    diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
    index 3a87f93..455d832 100644
    --- a/include/linux/bootmem.h
    +++ b/include/linux/bootmem.h
    @@ -65,22 +65,20 @@ extern void free_bootmem(unsigned long addr, unsigned long size);
    #define BOOTMEM_DEFAULT 0
    #define BOOTMEM_EXCLUSIVE (1<<0)

    -extern int reserve_bootmem_node(pg_data_t *pgdat,
    - unsigned long physaddr,
    - unsigned long size,
    - int flags);
    extern int reserve_bootmem(unsigned long addr,
    unsigned long size,
    int flags);
    -extern void *__alloc_bootmem_nopanic(unsigned long size,
    +extern int reserve_bootmem_node(pg_data_t *pgdat,
    + unsigned long physaddr,
    + unsigned long size,
    + int flags);
    +
    +extern void *__alloc_bootmem(unsigned long size,
    unsigned long align,
    unsigned long goal);
    -extern void *__alloc_bootmem(unsigned long size,
    +extern void *__alloc_bootmem_nopanic(unsigned long size,
    unsigned long align,
    unsigned long goal);
    -extern void *__alloc_bootmem_low(unsigned long size,
    - unsigned long align,
    - unsigned long goal);
    extern void *__alloc_bootmem_node(pg_data_t *pgdat,
    unsigned long size,
    unsigned long align,
    @@ -89,6 +87,9 @@ extern void *__alloc_bootmem_node_nopanic(pg_data_t *pgdat,
    unsigned long size,
    unsigned long align,
    unsigned long goal);
    +extern void *__alloc_bootmem_low(unsigned long size,
    + unsigned long align,
    + unsigned long goal);
    extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
    unsigned long size,
    unsigned long align,
    @@ -98,18 +99,21 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
    __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
    #define alloc_bootmem_nopanic(x) \
    __alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
    -#define alloc_bootmem_low(x) \
    - __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
    #define alloc_bootmem_pages(x) \
    __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
    #define alloc_bootmem_pages_nopanic(x) \
    __alloc_bootmem_nopanic(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
    -#define alloc_bootmem_low_pages(x) \
    - __alloc_bootmem_low(x, PAGE_SIZE, 0)
    #define alloc_bootmem_node(pgdat, x) \
    __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
    #define alloc_bootmem_pages_node(pgdat, x) \
    __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
    +#define alloc_bootmem_pages_node_nopanic(pgdat, x) \
    + __alloc_bootmem_node_nopanic(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
    +
    +#define alloc_bootmem_low(x) \
    + __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
    +#define alloc_bootmem_low_pages(x) \
    + __alloc_bootmem_low(x, PAGE_SIZE, 0)
    #define alloc_bootmem_low_pages_node(pgdat, x) \
    __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)

    --
    1.6.0.2


    \
     
     \ /
      Last update: 2009-02-24 04:17    [W:0.023 / U:35.660 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site