aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mn10300
diff options
context:
space:
mode:
authorStoyan Gaydarov <stoyboyker@gmail.com>2010-10-27 17:28:33 +0100
committerDavid Howells <dhowells@redhat.com>2010-10-27 17:28:33 +0100
commit292aa141277b142148d15bf28104f8890616e291 (patch)
tree5a6c3c34c1b86494c73ab34a90ed9d47b17295e1 /arch/mn10300
parent95a2f6f72d37762ba1b3d6c8031f66a6467a63df (diff)
downloadmrst-s0i3-test-292aa141277b142148d15bf28104f8890616e291.tar.gz
mrst-s0i3-test-292aa141277b142148d15bf28104f8890616e291.tar.xz
mrst-s0i3-test-292aa141277b142148d15bf28104f8890616e291.zip
MN10300: BUG to BUG_ON changes
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/mn10300')
-rw-r--r--arch/mn10300/kernel/irq.c3
-rw-r--r--arch/mn10300/mm/init.c3
-rw-r--r--arch/mn10300/mm/misalignment.c3
-rw-r--r--arch/mn10300/unit-asb2303/include/unit/timex.h3
-rw-r--r--arch/mn10300/unit-asb2305/include/unit/timex.h3
5 files changed, 5 insertions, 10 deletions
diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c
index e2d5ed891f3..b5b970d2954 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 6e6bc0e5152..f86c28315a8 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 6dffbf97ac2..eef989c1d0c 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 f206b63c95b..88cd96bb252 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 d1c72d59fa9..0860186eedb 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);
}
}