git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'slab/urgent' into slab/next
[pandora-kernel.git]
/
arch
/
tile
/
mm
/
init.c
diff --git
a/arch/tile/mm/init.c
b/arch/tile/mm/init.c
index
4e10c40
..
7309988
100644
(file)
--- a/
arch/tile/mm/init.c
+++ b/
arch/tile/mm/init.c
@@
-836,8
+836,7
@@
void __init mem_init(void)
#endif
#ifdef CONFIG_FLATMEM
- if (!mem_map)
- BUG();
+ BUG_ON(!mem_map);
#endif
#ifdef CONFIG_HIGHMEM