1 files changed, 35 insertions, 92 deletions

diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 52fd42c40c86..3e16fe08150e 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -229,7 +229,6 @@ __init void *early_ioremap(unsigned long addr, unsigned long size)
 
         /* actually usually some more */
         if (size >= LARGE_PAGE_SIZE) { 
-                printk("SMBIOS area too long %lu\n", size);
                 return NULL;
         }
         set_pmd(temp_mappings[0].pmd,  __pmd(map | _KERNPG_TABLE | _PAGE_PSE));
@@ -250,12 +249,13 @@ __init void early_iounmap(void *addr, unsigned long size)
 }
 
 static void __meminit
-phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)
+phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end)
 {
-        int i;
+        int i = pmd_index(address);
 
-        for (i = 0; i < PTRS_PER_PMD; pmd++, i++, address += PMD_SIZE) {
+        for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) {
                 unsigned long entry;
+                pmd_t *pmd = pmd_page + pmd_index(address);
 
                 if (address >= end) {
                         if (!after_bootmem)
@@ -263,6 +263,10 @@ phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)
                                         set_pmd(pmd, __pmd(0));
                         break;
                 }
+
+                if (pmd_val(*pmd))
+                        continue;
+
                 entry = _PAGE_NX|_PAGE_PSE|_KERNPG_TABLE|_PAGE_GLOBAL|address;
                 entry &= __supported_pte_mask;
                 set_pmd(pmd, __pmd(entry));
@@ -272,45 +276,41 @@ phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)
 static void __meminit
 phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end)
 {
-        pmd_t *pmd = pmd_offset(pud, (unsigned long)__va(address));
-
-        if (pmd_none(*pmd)) {
-                spin_lock(&init_mm.page_table_lock);
-                phys_pmd_init(pmd, address, end);
-                spin_unlock(&init_mm.page_table_lock);
-                __flush_tlb_all();
-        }
+        pmd_t *pmd = pmd_offset(pud,0);
+        spin_lock(&init_mm.page_table_lock);
+        phys_pmd_init(pmd, address, end);
+        spin_unlock(&init_mm.page_table_lock);
+        __flush_tlb_all();
 }
 
-static void __meminit phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
+static void __meminit phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end)
 { 
-        long i = pud_index(address);
+        int i = pud_index(addr);
 
-        pud = pud + i;
 
-        if (after_bootmem && pud_val(*pud)) {
-                phys_pmd_update(pud, address, end);
-                return;
-        }
-
-        for (; i < PTRS_PER_PUD; pud++, i++) {
+        for (; i < PTRS_PER_PUD; i++, addr = (addr & PUD_MASK) + PUD_SIZE ) {
                 int map; 
-                unsigned long paddr, pmd_phys;
+                unsigned long pmd_phys;
+                pud_t *pud = pud_page + pud_index(addr);
                 pmd_t *pmd;
 
-                paddr = (address & PGDIR_MASK) + i*PUD_SIZE;
-                if (paddr >= end)
+                if (addr >= end)
                         break;
 
-                if (!after_bootmem && !e820_any_mapped(paddr, paddr+PUD_SIZE, 0)) {
+                if (!after_bootmem && !e820_any_mapped(addr,addr+PUD_SIZE,0)) {
                         set_pud(pud, __pud(0)); 
                         continue;
                 } 
 
+                if (pud_val(*pud)) {
+                        phys_pmd_update(pud, addr, end);
+                        continue;
+                }
+
                 pmd = alloc_low_page(&map, &pmd_phys);
                 spin_lock(&init_mm.page_table_lock);
                 set_pud(pud, __pud(pmd_phys | _KERNPG_TABLE));
-                phys_pmd_init(pmd, paddr, end);
+                phys_pmd_init(pmd, addr, end);
                 spin_unlock(&init_mm.page_table_lock);
                 unmap_low_page(map);
         }
@@ -403,69 +403,15 @@ void __cpuinit zap_low_mappings(int cpu)
         __flush_tlb_all();
 }
 
-/* Compute zone sizes for the DMA and DMA32 zones in a node. */
-__init void
-size_zones(unsigned long *z, unsigned long *h,
-           unsigned long start_pfn, unsigned long end_pfn)
-{
-        int i;
-        unsigned long w;
-
-        for (i = 0; i < MAX_NR_ZONES; i++)
-                z[i] = 0;
-
-        if (start_pfn < MAX_DMA_PFN)
-                z[ZONE_DMA] = MAX_DMA_PFN - start_pfn;
-        if (start_pfn < MAX_DMA32_PFN) {
-                unsigned long dma32_pfn = MAX_DMA32_PFN;
-                if (dma32_pfn > end_pfn)
-                        dma32_pfn = end_pfn;
-                z[ZONE_DMA32] = dma32_pfn - start_pfn;
-        }
-        z[ZONE_NORMAL] = end_pfn - start_pfn;
-
-        /* Remove lower zones from higher ones. */
-        w = 0;
-        for (i = 0; i < MAX_NR_ZONES; i++) {
-                if (z[i])
-                        z[i] -= w;
-                w += z[i];
-        }
-
-        /* Compute holes */
-        w = start_pfn;
-        for (i = 0; i < MAX_NR_ZONES; i++) {
-                unsigned long s = w;
-                w += z[i];
-                h[i] = e820_hole_size(s, w);
-        }
-
-        /* Add the space pace needed for mem_map to the holes too. */
-        for (i = 0; i < MAX_NR_ZONES; i++)
-                h[i] += (z[i] * sizeof(struct page)) / PAGE_SIZE;
-
-        /* The 16MB DMA zone has the kernel and other misc mappings.
-           Account them too */
-        if (h[ZONE_DMA]) {
-                h[ZONE_DMA] += dma_reserve;
-                if (h[ZONE_DMA] >= z[ZONE_DMA]) {
-                        printk(KERN_WARNING
-                                "Kernel too large and filling up ZONE_DMA?\n");
-                        h[ZONE_DMA] = z[ZONE_DMA];
-                }
-        }
-}
-
 #ifndef CONFIG_NUMA
 void __init paging_init(void)
 {
-        unsigned long zones[MAX_NR_ZONES], holes[MAX_NR_ZONES];
-
+        unsigned long max_zone_pfns[MAX_NR_ZONES] = {MAX_DMA_PFN,
+                                                        MAX_DMA32_PFN,
+                                                        end_pfn};
         memory_present(0, 0, end_pfn);
         sparse_init();
-        size_zones(zones, holes, 0, end_pfn);
-        free_area_init_node(0, NODE_DATA(0), zones,
-                            __pa(PAGE_OFFSET) >> PAGE_SHIFT, holes);
+        free_area_init_nodes(max_zone_pfns);
 }
 #endif
 
@@ -597,12 +543,6 @@ void __init mem_init(void)
 
         pci_iommu_alloc();
 
-        /* How many end-of-memory variables you have, grandma! */
-        max_low_pfn = end_pfn;
-        max_pfn = end_pfn;
-        num_physpages = end_pfn;
-        high_memory = (void *) __va(end_pfn * PAGE_SIZE);
-
         /* clear the zero-page */
         memset(empty_zero_page, 0, PAGE_SIZE);
 
@@ -614,7 +554,8 @@ void __init mem_init(void)
 #else
         totalram_pages = free_all_bootmem();
 #endif
-        reservedpages = end_pfn - totalram_pages - e820_hole_size(0, end_pfn);
+        reservedpages = end_pfn - totalram_pages -
+                                        absent_pages_in_range(0, end_pfn);
 
         after_bootmem = 1;
 
@@ -714,8 +655,10 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
 #else                   
         reserve_bootmem(phys, len);    
 #endif
-        if (phys+len <= MAX_DMA_PFN*PAGE_SIZE)
+        if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) {
                 dma_reserve += len / PAGE_SIZE;
+                set_dma_reserve(dma_reserve);
+        }
 }
 
 int kern_addr_valid(unsigned long addr)