lkml.org 
[lkml]   [2004]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    From
    Subject[PATCH 2.6.6] bootmem.c cleanup
    Date
    Hi,

    This patch does some cleanup in mm/bootmem.c .
    It replaces some if (...) BUG(); with BUG_ON(...);,
    and fixes a typo.

    Some comment on my own patch:
    BUG() already dumps the stack, so we needn't call
    dump_stack() here, correct?
    @@ -152,7 +147,6 @@

    if(!size) {
    printk("__alloc_bootmem_core(): zero-sized request\n");
    - dump_stack();
    BUG();
    }
    BUG_ON(align & (align-1));
    --
    Regards Michael Buesch [ http://www.tuxsoft.de.vu ]





    --- linux-2.6.6/mm/bootmem.c.orig 2004-05-14 21:55:00.000000000 +0200
    +++ linux-2.6.6/mm/bootmem.c 2004-05-14 21:55:15.000000000 +0200
    @@ -82,14 +82,11 @@
    PAGE_SIZE-1)/PAGE_SIZE;
    unsigned long end = (addr + size + PAGE_SIZE-1)/PAGE_SIZE;

    - if (!size) BUG();
    + BUG_ON(!size);
    + BUG_ON(sidx >= eidx);
    + BUG_ON((addr >> PAGE_SHIFT) >= bdata->node_low_pfn);
    + BUG_ON(end > bdata->node_low_pfn);

    - if (sidx >= eidx)
    - BUG();
    - if ((addr >> PAGE_SHIFT) >= bdata->node_low_pfn)
    - BUG();
    - if (end > bdata->node_low_pfn)
    - BUG();
    for (i = sidx; i < eidx; i++)
    if (test_and_set_bit(i, bdata->node_bootmem_map)) {
    #ifdef CONFIG_DEBUG_BOOTMEM
    @@ -110,9 +107,8 @@
    unsigned long eidx = (addr + size - bdata->node_boot_start)/PAGE_SIZE;
    unsigned long end = (addr + size)/PAGE_SIZE;

    - if (!size) BUG();
    - if (end > bdata->node_low_pfn)
    - BUG();
    + BUG_ON(!size);
    + BUG_ON(end > bdata->node_low_pfn);

    if (addr < bdata->last_success)
    bdata->last_success = addr;
    @@ -124,8 +120,7 @@
    sidx = start - (bdata->node_boot_start/PAGE_SIZE);

    for (i = sidx; i < eidx; i++) {
    - if (!test_and_clear_bit(i, bdata->node_bootmem_map))
    - BUG();
    + BUG_ON(!test_and_clear_bit(i, bdata->node_bootmem_map));
    }
    }

    @@ -140,7 +135,7 @@
    *
    * alignment has to be a power of 2 value.
    *
    - * NOTE: This function is _not_ reenetrant.
    + * NOTE: This function is _not_ reentrant.
    */
    static void * __init
    __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
    @@ -152,7 +147,6 @@

    if(!size) {
    printk("__alloc_bootmem_core(): zero-sized request\n");
    - dump_stack();
    BUG();
    }
    BUG_ON(align & (align-1));
    @@ -246,8 +240,7 @@
    * Reserve the area now:
    */
    for (i = start; i < start+areasize; i++)
    - if (unlikely(test_and_set_bit(i, bdata->node_bootmem_map)))
    - BUG();
    + BUG_ON(test_and_set_bit(i, bdata->node_bootmem_map));
    memset(ret, 0, size);
    return ret;
    }
    @@ -260,7 +253,7 @@
    unsigned long idx;
    unsigned long *map;

    - if (!bdata->node_bootmem_map) BUG();
    + BUG_ON(!bdata->node_bootmem_map);

    count = 0;
    /* first extant page of the node */
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:03    [W:0.037 / U:61.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site