ChangeSet 1.2075, 2005/03/12 09:14:34-08:00, [EMAIL PROTECTED]
[PATCH] PA-RISC MM init fixes
- add missing header fixing build warning
From: Thibaut Varene <[EMAIL PROTECTED]>
- remove duplicate definition of max_pfn
From: Randolph Chung <[EMAIL PROTECTED]>
- remove unnecessary assignment to mem_map (thanks to Dave Hansen)
- print memory in MB, not Mb
Signed-off-by: Matthew Wilcox <[EMAIL PROTECTED]>
Signed-off-by: Matthew Wilcox <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
init.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff -Nru a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
--- a/arch/parisc/mm/init.c 2005-03-12 21:42:32 -08:00
+++ b/arch/parisc/mm/init.c 2005-03-12 21:42:32 -08:00
@@ -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 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 @@
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 @@
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 @@
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 @@
#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
{
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
