lkml.org 
[lkml]   [2009]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/25] [mips] BUG to BUG_ON changes
    Date
    Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
    ---
    arch/mips/jazz/jazzdma.c | 3 +--
    arch/mips/kernel/traps.c | 3 +--
    arch/mips/mm/ioremap.c | 9 +++------
    3 files changed, 5 insertions(+), 10 deletions(-)

    diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c
    index c672c08..f0fd636 100644
    --- a/arch/mips/jazz/jazzdma.c
    +++ b/arch/mips/jazz/jazzdma.c
    @@ -68,8 +68,7 @@ static int __init vdma_init(void)
    */
    pgtbl = (VDMA_PGTBL_ENTRY *)__get_free_pages(GFP_KERNEL | GFP_DMA,
    get_order(VDMA_PGTBL_SIZE));
    - if (!pgtbl)
    - BUG();
    + BUG_ON(!pgtbl);
    dma_cache_wback_inv((unsigned long)pgtbl, VDMA_PGTBL_SIZE);
    pgtbl = (VDMA_PGTBL_ENTRY *)KSEG1ADDR(pgtbl);

    diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
    index b2d7041..89956d5 100644
    --- a/arch/mips/kernel/traps.c
    +++ b/arch/mips/kernel/traps.c
    @@ -1277,8 +1277,7 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)
    u32 *w;
    unsigned char *b;

    - if (!cpu_has_veic && !cpu_has_vint)
    - BUG();
    + BUG_ON(!cpu_has_veic && !cpu_has_vint);

    if (addr == NULL) {
    handler = (unsigned long) do_default_vi;
    diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c
    index 59945b9..0c43248 100644
    --- a/arch/mips/mm/ioremap.c
    +++ b/arch/mips/mm/ioremap.c
    @@ -27,8 +27,7 @@ static inline void remap_area_pte(pte_t * pte, unsigned long address,
    end = address + size;
    if (end > PMD_SIZE)
    end = PMD_SIZE;
    - if (address >= end)
    - BUG();
    + BUG_ON(address >= end);
    pfn = phys_addr >> PAGE_SHIFT;
    do {
    if (!pte_none(*pte)) {
    @@ -52,8 +51,7 @@ static inline int remap_area_pmd(pmd_t * pmd, unsigned long address,
    if (end > PGDIR_SIZE)
    end = PGDIR_SIZE;
    phys_addr -= address;
    - if (address >= end)
    - BUG();
    + BUG_ON(address >= end);
    do {
    pte_t * pte = pte_alloc_kernel(pmd, address);
    if (!pte)
    @@ -75,8 +73,7 @@ static int remap_area_pages(unsigned long address, phys_t phys_addr,
    phys_addr -= address;
    dir = pgd_offset(&init_mm, address);
    flush_cache_all();
    - if (address >= end)
    - BUG();
    + BUG_ON(address >= end);
    do {
    pud_t *pud;
    pmd_t *pmd;
    --
    1.6.1.3


    \
     
     \ /
      Last update: 2009-03-10 06:17    [W:0.038 / U:31.060 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site