2 files changed, 2 insertions, 4 deletions

diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index 51e3739dd227..455597db84df 100644
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -153,8 +153,7 @@ static void __init find_max_pfn_node(int nid)
          */
         if (node_start_pfn[nid] > max_pfn)
                 node_start_pfn[nid] = max_pfn;
-        if (node_start_pfn[nid] > node_end_pfn[nid])
-                BUG();
+        BUG_ON(node_start_pfn[nid] > node_end_pfn[nid]);
 }
 
 /* 
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 90089c14c23d..167416155ee4 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -569,8 +569,7 @@ void __init mem_init(void)
         int bad_ppro;
 
 #ifdef CONFIG_FLATMEM
-        if (!mem_map)
-                BUG();
+        BUG_ON(!mem_map);
 #endif
         
         bad_ppro = ppro_with_ram_bug();