x86: BUG to BUG_ON changes
authorStoyan Gaydarov <stoyboyker@gmail.com>
Tue, 10 Mar 2009 05:10:32 +0000 (00:10 -0500)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 08:55:18 +0000 (09:55 +0100)
Impact: cleanup

Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
LKML-Reference: <1236661850-8237-8-git-send-email-stoyboyker@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/common.c
arch/x86/kernel/quirks.c

index 826d5c87627826911ac393f215c0cecb03f50ef9..f8869978bbb70eefca7021d83fa226f1f9da7915 100644 (file)
@@ -1078,8 +1078,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);
@@ -1145,8 +1144,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);
index 309949e9e1c1a9e65969507cb7dea1097a2410d9..6a5a2970f4c558182669ab9119e874eed5bf9702 100644 (file)
@@ -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);