aboutsummaryrefslogtreecommitdiff
path: root/arch/i386/mm
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-10-03 23:34:58 +0200
committerAdrian Bunk <bunk@stusta.de>2006-10-03 23:34:58 +0200
commit8d8f3cbe777e014123bfa63f2cebd6eb29032225 (patch)
tree5ca6abfa5e696d3c792050221c4f7326d676d23f /arch/i386/mm
parent644c12d7f695c0a30662ac781b0f06f79d7f9bab (diff)
BUG_ON cleanups in arch/i386
This changes a couple of if() BUG(); constructs to BUG_ON(); so it can be safely optimized away. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'arch/i386/mm')
-rw-r--r--arch/i386/mm/discontig.c3
-rw-r--r--arch/i386/mm/init.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index 51e3739dd22..455597db84d 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 90089c14c23..167416155ee 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();