summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiemo Seufer <ths@networkno.de>2007-01-24 01:29:15 +0000
committerRalf Baechle <ralf@linux-mips.org>2007-01-24 19:23:22 +0000
commit80aac59ed5b3e5ae2132bc620ff5607929c6a304 (patch)
tree99c76e80b8303c859ab71c6df4e3a8b4ec7955d5
parent3f3183709feb35c30ca5f649224d01921870f81c (diff)
downloadlinux-80aac59ed5b3e5ae2132bc620ff5607929c6a304.tar.gz
linux-80aac59ed5b3e5ae2132bc620ff5607929c6a304.tar.bz2
linux-80aac59ed5b3e5ae2132bc620ff5607929c6a304.zip
[MIPS] Fix reported amount of freed memory - it's in kB not bytes
While at it, change message on DEC for consistency. Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/dec/prom/memory.c2
-rw-r--r--arch/mips/mm/init.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c
index 3027ce782797..3aa01d268f2d 100644
--- a/arch/mips/dec/prom/memory.c
+++ b/arch/mips/dec/prom/memory.c
@@ -122,7 +122,7 @@ unsigned long __init prom_free_prom_memory(void)
addr += PAGE_SIZE;
}
- printk("Freeing unused PROM memory: %ldk freed\n",
+ printk("Freeing unused PROM memory: %ldkb freed\n",
(end - PAGE_SIZE) >> 10);
return end - PAGE_SIZE;
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 30245c09d025..49065c133ebf 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -501,7 +501,8 @@ void free_initmem(void)
freed = prom_free_prom_memory();
if (freed)
- printk(KERN_INFO "Freeing firmware memory: %ldk freed\n",freed);
+ printk(KERN_INFO "Freeing firmware memory: %ldkb freed\n",
+ freed >> 10);
free_init_pages("unused kernel memory",
__pa_symbol(&__init_begin),