[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-8c5dfd25519bf302ba43daa59976c4d675a594a7@git.kernel.org>
Date: Tue, 10 Mar 2009 08:57:31 GMT
From: Stoyan Gaydarov <stoyboyker@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
stoyboyker@...il.com, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/debug] x86: BUG to BUG_ON changes
Commit-ID: 8c5dfd25519bf302ba43daa59976c4d675a594a7
Gitweb: http://git.kernel.org/tip/8c5dfd25519bf302ba43daa59976c4d675a594a7
Author: "Stoyan Gaydarov" <stoyboyker@...il.com>
AuthorDate: Tue, 10 Mar 2009 00:10:32 -0500
Commit: Ingo Molnar <mingo@...e.hu>
CommitDate: Tue, 10 Mar 2009 09:55:18 +0100
x86: BUG to BUG_ON changes
Impact: cleanup
Signed-off-by: Stoyan Gaydarov <stoyboyker@...il.com>
LKML-Reference: <1236661850-8237-8-git-send-email-stoyboyker@...il.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/cpu/common.c | 6 ++----
arch/x86/kernel/quirks.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 826d5c8..f886997 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, ¤t->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 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists