2 files changed, 16 insertions, 18 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 153a54b2013c..e5628a5fd678 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -134,11 +134,9 @@ void pmd_clear_bad(pmd_t *pmd)
  */
 static void free_pte_range(struct mmu_gather *tlb, pmd_t *pmd)
 {
-        struct page *page = pmd_page(*pmd);
+        pgtable_t token = pmd_pgtable(*pmd);
         pmd_clear(pmd);
-        pte_lock_deinit(page);
-        pte_free_tlb(tlb, page);
-        dec_zone_page_state(page, NR_PAGETABLE);
+        pte_free_tlb(tlb, token);
         tlb->mm->nr_ptes--;
 }
 
@@ -309,21 +307,19 @@ void free_pgtables(struct mmu_gather **tlb, struct vm_area_struct *vma,
 
 int __pte_alloc(struct mm_struct *mm, pmd_t *pmd, unsigned long address)
 {
-        struct page *new = pte_alloc_one(mm, address);
+        pgtable_t new = pte_alloc_one(mm, address);
         if (!new)
                 return -ENOMEM;
 
-        pte_lock_init(new);
         spin_lock(&mm->page_table_lock);
-        if (pmd_present(*pmd)) {        /* Another has populated it */
-                pte_lock_deinit(new);
-                pte_free(mm, new);
-        } else {
+        if (!pmd_present(*pmd)) {       /* Has another populated it ? */
                 mm->nr_ptes++;
-                inc_zone_page_state(new, NR_PAGETABLE);
                 pmd_populate(mm, pmd, new);
+                new = NULL;
         }
         spin_unlock(&mm->page_table_lock);
+        if (new)
+                pte_free(mm, new);
         return 0;
 }
 
@@ -334,11 +330,13 @@ int __pte_alloc_kernel(pmd_t *pmd, unsigned long address)
                 return -ENOMEM;
 
         spin_lock(&init_mm.page_table_lock);
-        if (pmd_present(*pmd))          /* Another has populated it */
-                pte_free_kernel(&init_mm, new);
-        else
+        if (!pmd_present(*pmd)) {       /* Has another populated it ? */
                 pmd_populate_kernel(&init_mm, pmd, new);
+                new = NULL;
+        }
         spin_unlock(&init_mm.page_table_lock);
+        if (new)
+                pte_free_kernel(&init_mm, new);
         return 0;
 }
 
@@ -1390,7 +1388,7 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd,
 {
         pte_t *pte;
         int err;
-        struct page *pmd_page;
+        pgtable_t token;
         spinlock_t *uninitialized_var(ptl);
 
         pte = (mm == &init_mm) ?
@@ -1401,10 +1399,10 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd,
 
         BUG_ON(pmd_huge(*pmd));
 
-        pmd_page = pmd_page(*pmd);
+        token = pmd_pgtable(*pmd);
 
         do {
-                err = fn(pte, pmd_page, addr, data);
+                err = fn(pte, token, addr, data);
                 if (err)
                         break;
         } while (pte++, addr += PAGE_SIZE, addr != end);
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 0536dde139d1..950c0be9ca81 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -820,7 +820,7 @@ void  __attribute__((weak)) vmalloc_sync_all(void)
 }
 
 
-static int f(pte_t *pte, struct page *pmd_page, unsigned long addr, void *data)
+static int f(pte_t *pte, pgtable_t table, unsigned long addr, void *data)
 {
         /* apply_to_page_range() does all the hard work. */
         return 0;