diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/m68knommu/mm/init.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/m68knommu/mm/init.c')
| -rw-r--r-- | arch/m68knommu/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c index b1703c67a4f1..f3236d0b522d 100644 --- a/arch/m68knommu/mm/init.c +++ b/arch/m68knommu/mm/init.c | |||
| @@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
| 162 | totalram_pages++; | 162 | totalram_pages++; |
| 163 | pages++; | 163 | pages++; |
| 164 | } | 164 | } |
| 165 | printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages); | 165 | printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024)); |
| 166 | } | 166 | } |
| 167 | #endif | 167 | #endif |
| 168 | 168 | ||