[tip:x86/urgent] x86: apic: Convert BUG() to BUG_ON()
From: tip-bot for Daniel Walker
Date: Fri Sep 18 2009 - 07:49:19 EST
Commit-ID: c2777f98c205148f1a0d4f9ac03b9cb20b39b2da
Gitweb: http://git.kernel.org/tip/c2777f98c205148f1a0d4f9ac03b9cb20b39b2da
Author: Daniel Walker <dwalker@xxxxxxxxxx>
AuthorDate: Sat, 12 Sep 2009 10:40:20 -0700
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Fri, 18 Sep 2009 13:45:33 +0200
x86: apic: Convert BUG() to BUG_ON()
This was done using Coccinelle's BUG_ON semantic patch.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx>
Cc: Julia Lawall <julia@xxxxxxx>
LKML-Reference: <1252777220-30796-1-git-send-email-dwalker@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/apic/apic.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 159740d..79e5b92 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1196,8 +1196,7 @@ void __cpuinit setup_local_APIC(void)
* Double-check whether this APIC is really registered.
* This is meaningless in clustered apic mode, so we skip it.
*/
- if (!apic->apic_id_registered())
- BUG();
+ BUG_ON(!apic->apic_id_registered());
/*
* Intel recommends to set DFR, LDR and TPR before enabling
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/