summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStoyan Gaydarov <stoyboyker@gmail.com>2009-03-10 00:10:32 -0500
committerIngo Molnar <mingo@elte.hu>2009-03-10 09:55:18 +0100
commit8c5dfd25519bf302ba43daa59976c4d675a594a7 (patch)
treebd9273f5d17d5a38fd56b7685095ffc5ed259345
parent467c88fee51e2ae862e9485245687da0730e29aa (diff)
downloadblackbird-op-linux-8c5dfd25519bf302ba43daa59976c4d675a594a7.tar.gz
blackbird-op-linux-8c5dfd25519bf302ba43daa59976c4d675a594a7.zip
x86: BUG to BUG_ON changes
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>
-rw-r--r--arch/x86/kernel/cpu/common.c6
-rw-r--r--arch/x86/kernel/quirks.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 826d5c876278..f8869978bbb7 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -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);
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 309949e9e1c1..6a5a2970f4c5 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);
OpenPOWER on IntegriCloud