Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / cris / mm / init.c

diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index 2fdd212eb250002cf5bfd53bb513c86bea15a8f4..514f46a4b2303baef15045e55fb218b8b1834c28 100644 (file)
--- 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...