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 07/25] [x86] BUG to BUG_ON changes
    Date
    Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
    ---
    arch/x86/kernel/cpu/common.c | 6 ++----
    arch/x86/kernel/quirks.c | 3 +--
    arch/x86/mach-voyager/voyager_smp.c | 6 ++----
    3 files changed, 5 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index 83492b1..86206c6 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -1051,8 +1051,7 @@ void __cpuinit cpu_init(void)

    atomic_inc(&init_mm.mm_count);
    me->active_mm = &init_mm;
    - if (me->mm)
    - BUG();
    + BUG_ON(me->mm);
    enter_lazy_tlb(&init_mm, me);

    load_sp0(t, &current->thread);
    @@ -1121,8 +1120,7 @@ void __cpuinit cpu_init(void)
    */
    atomic_inc(&init_mm.mm_count);
    curr->active_mm = &init_mm;
    - if (curr->mm)
    - BUG();
    + BUG_ON(curr->mm);
    enter_lazy_tlb(&init_mm, curr);

    load_sp0(t, thread);
    diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
    index 309949e..6a5a297 100644
    --- a/arch/x86/kernel/quirks.c
    +++ b/arch/x86/kernel/quirks.c
    @@ -74,8 +74,7 @@ static void ich_force_hpet_resume(void)
    if (!force_hpet_address)
    return;

    - if (rcba_base == NULL)
    - BUG();
    + BUG_ON(rcba_base == NULL);

    /* read the Function Disable register, dword mode only */
    val = readl(rcba_base + 0x3404);
    diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
    index b9cc84a..1a35fe1 100644
    --- a/arch/x86/mach-voyager/voyager_smp.c
    +++ b/arch/x86/mach-voyager/voyager_smp.c
    @@ -825,14 +825,12 @@ voyager_flush_tlb_others(unsigned long cpumask, struct mm_struct *mm,
    {
    int stuck = 50000;

    - if (!cpumask)
    - BUG();
    + BUG_ON(!cpumask);
    if ((cpumask & cpus_addr(cpu_online_map)[0]) != cpumask)
    BUG();
    if (cpumask & (1 << smp_processor_id()))
    BUG();
    - if (!mm)
    - BUG();
    + BUG_ON(!mm);

    spin_lock(&tlbstate_lock);

    --
    1.6.1.3


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