diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 11:15:40 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 11:15:40 +0200 |
commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
tree | e081135619ee146af5efb9ee883afca950df5757 /arch/cris/mm/init.c | |
parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
Diffstat (limited to 'arch/cris/mm/init.c')
-rw-r--r-- | arch/cris/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c index 2fdd212eb25..514f46a4b23 100644 --- a/arch/cris/mm/init.c +++ b/arch/cris/mm/init.c @@ -25,8 +25,7 @@ mem_init(void) int codesize, reservedpages, datasize, initsize; unsigned long tmp; - if(!mem_map) - BUG(); + BUG_ON(!mem_map); /* max/min_low_pfn was set by setup.c * now we just copy it to some other necessary places... |