upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c
index 17f7dc3..1f09a9d 100644 (file)
--- a/arch/arm26/mm/init.c
+++ b/arch/arm26/mm/init.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mm/init.c
+ *  linux/arch/arm26/mm/init.c
  *
  *  Copyright (C) 1995-2002 Russell King
  *
@@ -26,7 +26,6 @@
 
 #include <asm/segment.h>
 #include <asm/mach-types.h>
-#include <asm/pgalloc.h>
 #include <asm/dma.h>
 #include <asm/hardware.h>
 #include <asm/setup.h>
@@ -84,7 +83,7 @@ void show_mem(void)
                else if (!page_count(page))
                        free++;
                else
-                       shared += atomic_read(&page->count) - 1;
+                       shared += page_count(page) - 1;
                page++;
        } while (page < end);
 
@@ -156,7 +155,8 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
 {
        unsigned int memend_pfn = 0;
 
-       numnodes = 1;
+       nodes_clear(node_online_map);
+       node_set_online(0);
 
        np->bootmap_pages = 0;
 
@@ -309,8 +309,6 @@ void __init paging_init(struct meminfo *mi)
        free_area_init_node(0, pgdat, zone_size,
                        bdata->node_boot_start >> PAGE_SHIFT, zhole_size);
 
-       mem_map = NODE_DATA(0)->node_mem_map;
-
        /*
         * finish off the bad pages once
         * the mem_map is initialised