Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / mm / init_64.c

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 7bf1ddb54537472db71bd7913ce26f5d8da76f33..53cc2256cf239a54be55f3b552b788350ddf3a25 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -362,7 +362,7 @@ phys_pte_init(pte_t *pte_page, unsigned long paddr, unsigned long paddr_end,
                 * pagetable pages as RO. So assume someone who pre-setup
                 * these mappings are more intelligent.
                 */
-               if (pte_val(*pte)) {
+               if (!pte_none(*pte)) {
                        if (!after_bootmem)
                                pages++;
                        continue;
@@ -411,7 +411,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_end,
                        continue;
                }
 
-               if (pmd_val(*pmd)) {
+               if (!pmd_none(*pmd)) {
                        if (!pmd_large(*pmd)) {
                                spin_lock(&init_mm.page_table_lock);
                                pte = (pte_t *)pmd_page_vaddr(*pmd);
@@ -497,7 +497,7 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end,
                        continue;
                }
 
-               if (pud_val(*pud)) {
+               if (!pud_none(*pud)) {
                        if (!pud_large(*pud)) {
                                pmd = pmd_offset(pud, 0);
                                paddr_last = phys_pmd_init(pmd, paddr,
@@ -708,7 +708,7 @@ static void __meminit free_pte_table(pte_t *pte_start, pmd_t *pmd)
 
        for (i = 0; i < PTRS_PER_PTE; i++) {
                pte = pte_start + i;
-               if (pte_val(*pte))
+               if (!pte_none(*pte))
                        return;
        }
 
@@ -726,7 +726,7 @@ static void __meminit free_pmd_table(pmd_t *pmd_start, pud_t *pud)
 
        for (i = 0; i < PTRS_PER_PMD; i++) {
                pmd = pmd_start + i;
-               if (pmd_val(*pmd))
+               if (!pmd_none(*pmd))
                        return;
        }
 
@@ -737,27 +737,6 @@ static void __meminit free_pmd_table(pmd_t *pmd_start, pud_t *pud)
        spin_unlock(&init_mm.page_table_lock);
 }
 
-/* Return true if pgd is changed, otherwise return false. */
-static bool __meminit free_pud_table(pud_t *pud_start, pgd_t *pgd)
-{
-       pud_t *pud;
-       int i;
-
-       for (i = 0; i < PTRS_PER_PUD; i++) {
-               pud = pud_start + i;
-               if (pud_val(*pud))
-                       return false;
-       }
-
-       /* free a pud table */
-       free_pagetable(pgd_page(*pgd), 0);
-       spin_lock(&init_mm.page_table_lock);
-       pgd_clear(pgd);
-       spin_unlock(&init_mm.page_table_lock);
-
-       return true;
-}
-
 static void __meminit
 remove_pte_table(pte_t *pte_start, unsigned long addr, unsigned long end,
                 bool direct)
@@ -948,7 +927,6 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct)
        unsigned long addr;
        pgd_t *pgd;
        pud_t *pud;
-       bool pgd_changed = false;
 
        for (addr = start; addr < end; addr = next) {
                next = pgd_addr_end(addr, end);
@@ -959,13 +937,8 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct)
 
                pud = (pud_t *)pgd_page_vaddr(*pgd);
                remove_pud_table(pud, addr, next, direct);
-               if (free_pud_table(pud, pgd))
-                       pgd_changed = true;
        }
 
-       if (pgd_changed)
-               sync_global_pgds(start, end - 1, 1);
-
        flush_tlb_all();
 }