2 files changed, 9 insertions, 11 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index ac3c959e27..8fe576baa1 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -134,8 +134,6 @@ static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
                         return NULL;
         }
 
-        WARN_ON_ONCE(page_is_ram(pfn));
-
         switch (mode) {
         case IOR_MODE_UNCACHED:
         default:
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
index 73aba71252..2f9e9afcb9 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -342,12 +342,16 @@ static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
 
 pgd_t *pgd_alloc(struct mm_struct *mm)
 {
-        pgd_t *pgd = quicklist_alloc(0, GFP_KERNEL, pgd_ctor);
+        pgd_t *pgd = (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
 
-        mm->pgd = pgd;          /* so that alloc_pd can use it */
+        /* so that alloc_pd can use it */
+        mm->pgd = pgd;
+        if (pgd)
+                pgd_ctor(pgd);
 
         if (pgd && !pgd_prepopulate_pmd(mm, pgd)) {
-                quicklist_free(0, pgd_dtor, pgd);
+                pgd_dtor(pgd);
+                free_page((unsigned long)pgd);
                 pgd = NULL;
         }
 
@@ -357,12 +361,8 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
 {
         pgd_mop_up_pmds(mm, pgd);
-        quicklist_free(0, pgd_dtor, pgd);
-}
-
-void check_pgt_cache(void)
-{
-        quicklist_trim(0, pgd_dtor, 25, 16);
+        pgd_dtor(pgd);
+        free_page((unsigned long)pgd);
 }
 
 void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte)