vserver 1.9.5.x5

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

diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 448e80c..6e31db0 100644 (file)
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -31,6 +31,7 @@
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
 #include <linux/initrd.h>
+#include <linux/pagemap.h>
 
 #include <asm/pgalloc.h>
 #include <asm/prom.h>
@@ -104,6 +105,7 @@ extern unsigned long sysmap_size;
  * -- Cort
  */
 int __map_without_bats;
+int __map_without_ltlbs;
 
 /* max amount of RAM to use */
 unsigned long __max_memory;
@@ -204,6 +206,10 @@ void MMU_setup(void)
                __map_without_bats = 1;
        }
 
+       if (strstr(cmd_line, "noltlbs")) {
+               __map_without_ltlbs = 1;
+       }
+
        /* Look for mem= option on command line */
        if (strstr(cmd_line, "mem=")) {
                char *p, *q;
@@ -406,7 +412,6 @@ void __init mem_init(void)
        unsigned long highmem_mapnr;
 
        highmem_mapnr = total_lowmem >> PAGE_SHIFT;
-       highmem_start_page = mem_map + highmem_mapnr;
 #endif /* CONFIG_HIGHMEM */
        max_mapnr = total_memory >> PAGE_SHIFT;