lkml.org 
[lkml]   [2010]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 02/43] MN10300: BUG to BUG_ON changes
From
Date
From: Stoyan Gaydarov <stoyboyker@gmail.com>

Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---

arch/mn10300/kernel/irq.c | 3 +--
arch/mn10300/mm/init.c | 3 +--
arch/mn10300/mm/misalignment.c | 3 +--
arch/mn10300/unit-asb2303/include/unit/timex.h | 3 +--
arch/mn10300/unit-asb2305/include/unit/timex.h | 3 +--
5 files changed, 5 insertions(+), 10 deletions(-)


diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c
index e2d5ed8..b5b970d 100644
--- a/arch/mn10300/kernel/irq.c
+++ b/arch/mn10300/kernel/irq.c
@@ -159,8 +159,7 @@ asmlinkage void do_IRQ(void)
int irq;

sp = current_stack_pointer();
- if (sp - (sp & ~(THREAD_SIZE - 1)) < STACK_WARN)
- BUG();
+ BUG_ON(sp - (sp & ~(THREAD_SIZE - 1)) < STACK_WARN);

/* make sure local_irq_enable() doesn't muck up the interrupt priority
* setting in EPSW */
diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c
index 6e6bc0e..f86c283 100644
--- a/arch/mn10300/mm/init.c
+++ b/arch/mn10300/mm/init.c
@@ -84,8 +84,7 @@ void __init mem_init(void)
int codesize, reservedpages, datasize, initsize;
int tmp;

- if (!mem_map)
- BUG();
+ BUG_ON(!mem_map);

#define START_PFN (contig_page_data.bdata->node_min_pfn)
#define MAX_LOW_PFN (contig_page_data.bdata->node_low_pfn)
diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c
index 6dffbf9..eef989c 100644
--- a/arch/mn10300/mm/misalignment.c
+++ b/arch/mn10300/mm/misalignment.c
@@ -449,8 +449,7 @@ found_opcode:
regs->pc, opcode, pop->opcode, pop->params[0], pop->params[1]);

tmp = format_tbl[pop->format].opsz;
- if (tmp > noc)
- BUG(); /* match was less complete than it ought to have been */
+ BUG_ON(tmp > noc); /* match was less complete than it ought to have been */

if (tmp < noc) {
tmp = noc - tmp;
diff --git a/arch/mn10300/unit-asb2303/include/unit/timex.h b/arch/mn10300/unit-asb2303/include/unit/timex.h
index f206b63..88cd96b 100644
--- a/arch/mn10300/unit-asb2303/include/unit/timex.h
+++ b/arch/mn10300/unit-asb2303/include/unit/timex.h
@@ -50,8 +50,7 @@ static inline void startup_jiffies_counter(void)
md = TM0MD_SRC_IOCLK_32;
rate = MN10300_JCCLK / 32 / HZ;

- if (rate > TMJCBR_MAX)
- BUG();
+ BUG_ON(rate > TMJCBR_MAX);
}
}

diff --git a/arch/mn10300/unit-asb2305/include/unit/timex.h b/arch/mn10300/unit-asb2305/include/unit/timex.h
index d1c72d5..0860186 100644
--- a/arch/mn10300/unit-asb2305/include/unit/timex.h
+++ b/arch/mn10300/unit-asb2305/include/unit/timex.h
@@ -50,8 +50,7 @@ static inline void startup_jiffies_counter(void)
md = TM0MD_SRC_IOCLK_32;
rate = MN10300_JCCLK / 32 / HZ;

- if (rate > TMJCBR_MAX)
- BUG();
+ BUG_ON(rate > TMJCBR_MAX);
}
}



\
 
 \ /
  Last update: 2010-10-26 04:55    [W:0.616 / U:0.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site