vserver 2.0 rc7

[linux-2.6.git] / arch / parisc / mm / init.c

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index ff0e1ea..cac3758 100644 (file)
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -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
        {