git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
mm
/
init.c
diff --git
a/arch/ia64/mm/init.c
b/arch/ia64/mm/init.c
index 8503d534794fd811b69d74638f65055269b6180c..c0f3bee690424da0ed3f7489fd57b832b8d622cc 100644
(file)
--- a/
arch/ia64/mm/init.c
+++ b/
arch/ia64/mm/init.c
@@
-636,8
+636,7
@@
mem_init (void)
#endif
#ifdef CONFIG_FLATMEM
- if (!mem_map)
- BUG();
+ BUG_ON(!mem_map);
max_mapnr = max_low_pfn;
#endif