---

yaml --- r: 38328 b: refs/heads/master c: 8d8f3cb h: refs/heads/master v: v3
git-mirror · Oct 3, 2006 · bc7f979 · bc7f979
1 parent 45134c2
commit bc7f979
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 644c12d7f695c0a30662ac781b0f06f79d7f9bab
+refs/heads/master: 8d8f3cbe777e014123bfa63f2cebd6eb29032225
diff --git a/trunk/arch/i386/kernel/cpu/common.c b/trunk/arch/i386/kernel/cpu/common.c
@@ -669,8 +669,7 @@ void __cpuinit cpu_init(void)
 	 */
 	atomic_inc(&init_mm.mm_count);
 	current->active_mm = &init_mm;
-	if (current->mm)
-		BUG();
+	BUG_ON(current->mm);
 	enter_lazy_tlb(&init_mm, current);
 
 	load_esp0(t, thread);

diff --git a/trunk/arch/i386/kernel/efi.c b/trunk/arch/i386/kernel/efi.c
@@ -498,8 +498,7 @@ void __init efi_enter_virtual_mode(void)
 		check_range_for_systab(md);
 	}
 
-	if (!efi.systab)
-		BUG();
+	BUG_ON(!efi.systab);
 
 	status = phys_efi_set_virtual_address_map(
 			memmap.desc_size * memmap.nr_map,

diff --git a/trunk/arch/i386/mm/discontig.c b/trunk/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/trunk/arch/i386/mm/init.c b/trunk/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();