This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 3d7e4ed..c114be6 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -77,7 +77,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);
        }
@@ -225,6 +225,8 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
                bootmem_pages += np[i].bootmap_pages;
        }
 
+       high_memory = __va(memend_pfn << PAGE_SHIFT);
+
        /*
         * This doesn't seem to be used by the Linux memory
         * manager any more.  If we can get rid of it, we
@@ -232,7 +234,6 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
         */
        max_low_pfn = memend_pfn - O_PFN_DOWN(PHYS_OFFSET);
        max_pfn = memend_pfn - O_PFN_DOWN(PHYS_OFFSET);
-       mi->end = memend_pfn << PAGE_SHIFT;
 
        return bootmem_pages;
 }
@@ -546,7 +547,6 @@ void __init mem_init(void)
        datapages = &_end - &_etext;
        initpages = &__init_end - &__init_begin;
 
-       high_memory = (void *)__va(meminfo.end);
 #ifndef CONFIG_DISCONTIGMEM
        max_mapnr   = virt_to_page(high_memory) - mem_map;
 #endif