MN10300: BUG to BUG_ON changes

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

diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c
index e2d5ed891f37b6c7471108f25c2e57dd425ba28f..b5b970d2954aeedf33709ee9d66c0aa8d27fd521 100644 (file)
--- 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 6e6bc0e51521811895e4c3e11e73fdb2fdc49118..f86c28315a8e0272b76b16d4e09c631f40606d62 100644 (file)
--- 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 6dffbf97ac2601d40ceb91a2e4a5116fd1bceeb8..eef989c1d0c10baf8614edbd8f87ea09c4d2cf91 100644 (file)
--- 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 f206b63c95b4f282114315870d12458a19c6a700..88cd96bb2527f32c53544844a45d79cd9a964efe 100644 (file)
--- 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 d1c72d59fa9fa92e4ce0710979c14b9c879d5e6d..0860186eedb24b0789321e1800e117e34467f7cf 100644 (file)
--- 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);
                }
        }