Commit 01c7a821 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] PA-RISC MM init fixes

 - add missing header fixing build warning
From: Thibaut Varene <varenet@parisc-linux.org>

 - remove duplicate definition of max_pfn
From: Randolph Chung <tausq@parisc-linux.org>

 - remove unnecessary assignment to mem_map (thanks to Dave Hansen)
 - print memory in MB, not Mb
Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c84d973b
......@@ -21,6 +21,7 @@
#include <linux/swap.h>
#include <linux/unistd.h>
#include <linux/nodemask.h> /* for node_online_map */
#include <linux/pagemap.h> /* for release_pages and page_cache_release */
#include <asm/pgalloc.h>
#include <asm/tlb.h>
......@@ -59,8 +60,6 @@ static struct resource pdcdata_resource = {
static struct resource sysram_resources[MAX_PHYSMEM_RANGES];
static unsigned long max_pfn;
/* The following array is initialized from the firmware specific
* information retrieved in kernel/inventory.c.
*/
......@@ -180,7 +179,7 @@ static void __init setup_bootmem(void)
size = (pmem_ranges[i].pages << PAGE_SHIFT);
start = (pmem_ranges[i].start_pfn << PAGE_SHIFT);
printk(KERN_INFO "%2d) Start 0x%016lx End 0x%016lx Size %6ld Mb\n",
printk(KERN_INFO "%2d) Start 0x%016lx End 0x%016lx Size %6ld MB\n",
i,start, start + (size - 1), size >> 20);
}
}
......@@ -213,7 +212,7 @@ static void __init setup_bootmem(void)
rsize = pmem_ranges[i].pages << PAGE_SHIFT;
if ((mem_max + rsize) > mem_limit) {
printk(KERN_WARNING "Memory truncated to %ld Mb\n", mem_limit >> 20);
printk(KERN_WARNING "Memory truncated to %ld MB\n", mem_limit >> 20);
if (mem_max == mem_limit)
npmem_ranges = i;
else {
......@@ -229,7 +228,7 @@ static void __init setup_bootmem(void)
mem_max += rsize;
}
printk(KERN_INFO "Total Memory: %ld Mb\n",mem_max >> 20);
printk(KERN_INFO "Total Memory: %ld MB\n",mem_max >> 20);
#ifndef CONFIG_DISCONTIGMEM
/* Merge the ranges, keeping track of the holes */
......@@ -445,7 +444,6 @@ void __init mem_init(void)
#ifndef CONFIG_DISCONTIGMEM
max_mapnr = page_to_pfn(virt_to_page(high_memory - 1)) + 1;
mem_map = zone_table[ZONE_DMA]->zone_mem_map;
totalram_pages += free_all_bootmem();
#else
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment