Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / c6x / mm / init.c

diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c
index a9fcd89b251b6ebd25eef44ce010cc8cf2f7c8a9..63f5560d6eb25df9fbf8b2a739748581c8482fc6 100644 (file)
--- a/arch/c6x/mm/init.c
+++ b/arch/c6x/mm/init.c
@@ -18,6 +18,7 @@
 #include <linux/initrd.h>
 
 #include <asm/sections.h>
+#include <asm/uaccess.h>
 
 /*
  * ZERO_PAGE is a special page that is used for zero-initialized
@@ -57,31 +58,22 @@ void __init paging_init(void)
 
 void __init mem_init(void)
 {
-       int codek, datak;
-       unsigned long tmp;
-       unsigned long len = memory_end - memory_start;
-
        high_memory = (void *)(memory_end & PAGE_MASK);
 
        /* this will put all memory onto the freelists */
-       totalram_pages = free_all_bootmem();
-
-       codek = (_etext - _stext) >> 10;
-       datak = (_end - _sdata) >> 10;
+       free_all_bootmem();
 
-       tmp = nr_free_pages() << PAGE_SHIFT;
-       printk(KERN_INFO "Memory: %luk/%luk RAM (%dk kernel code, %dk data)\n",
-              tmp >> 10, len >> 10, codek, datak);
+       mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-       free_reserved_area(start, end, 0, "initrd");
+       free_reserved_area((void *)start, (void *)end, -1, "initrd");
 }
 #endif
 
 void __init free_initmem(void)
 {
-       free_initmem_default(0);
+       free_initmem_default(-1);
 }