From 641b603d7b612854c357561a3d71efda8f84ade0 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Wed, 24 Jan 2007 01:29:15 +0000 Subject: [PATCH] --- yaml --- r: 45808 b: refs/heads/master c: 80aac59ed5b3e5ae2132bc620ff5607929c6a304 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/dec/prom/memory.c | 2 +- trunk/arch/mips/mm/init.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 28183f8b5abe..74a0ad87a0ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f3183709feb35c30ca5f649224d01921870f81c +refs/heads/master: 80aac59ed5b3e5ae2132bc620ff5607929c6a304 diff --git a/trunk/arch/mips/dec/prom/memory.c b/trunk/arch/mips/dec/prom/memory.c index 3027ce782797..3aa01d268f2d 100644 --- a/trunk/arch/mips/dec/prom/memory.c +++ b/trunk/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/trunk/arch/mips/mm/init.c b/trunk/arch/mips/mm/init.c index 30245c09d025..49065c133ebf 100644 --- a/trunk/arch/mips/mm/init.c +++ b/trunk/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),