aboutsummaryrefslogtreecommitdiffstats
path: root/arch/c6x/mm/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/c6x/mm/init.c')
-rw-r--r--arch/c6x/mm/init.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c
index a9fcd89b251b..63f5560d6eb2 100644
--- a/arch/c6x/mm/init.c
+++ b/arch/c6x/mm/init.c
@@ -18,6 +18,7 @@
18#include <linux/initrd.h> 18#include <linux/initrd.h>
19 19
20#include <asm/sections.h> 20#include <asm/sections.h>
21#include <asm/uaccess.h>
21 22
22/* 23/*
23 * ZERO_PAGE is a special page that is used for zero-initialized 24 * ZERO_PAGE is a special page that is used for zero-initialized
@@ -57,31 +58,22 @@ void __init paging_init(void)
57 58
58void __init mem_init(void) 59void __init mem_init(void)
59{ 60{
60 int codek, datak;
61 unsigned long tmp;
62 unsigned long len = memory_end - memory_start;
63
64 high_memory = (void *)(memory_end & PAGE_MASK); 61 high_memory = (void *)(memory_end & PAGE_MASK);
65 62
66 /* this will put all memory onto the freelists */ 63 /* this will put all memory onto the freelists */
67 totalram_pages = free_all_bootmem(); 64 free_all_bootmem();
68
69 codek = (_etext - _stext) >> 10;
70 datak = (_end - _sdata) >> 10;
71 65
72 tmp = nr_free_pages() << PAGE_SHIFT; 66 mem_init_print_info(NULL);
73 printk(KERN_INFO "Memory: %luk/%luk RAM (%dk kernel code, %dk data)\n",
74 tmp >> 10, len >> 10, codek, datak);
75} 67}
76 68
77#ifdef CONFIG_BLK_DEV_INITRD 69#ifdef CONFIG_BLK_DEV_INITRD
78void __init free_initrd_mem(unsigned long start, unsigned long end) 70void __init free_initrd_mem(unsigned long start, unsigned long end)
79{ 71{
80 free_reserved_area(start, end, 0, "initrd"); 72 free_reserved_area((void *)start, (void *)end, -1, "initrd");
81} 73}
82#endif 74#endif
83 75
84void __init free_initmem(void) 76void __init free_initmem(void)
85{ 77{
86 free_initmem_default(0); 78 free_initmem_default(-1);
87} 79}