4 files changed, 6 insertions, 53 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 6e41471449c0..de1bff659969 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -31,6 +31,10 @@ config ZONE_DMA
         def_bool y
         depends on !IA64_SGI_SN2
 
+config QUICKLIST
+        bool
+        default y
+
 config MMU
         bool
         default y
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 44ce5ed9444c..7ac8592a35b6 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -88,7 +88,7 @@ void show_mem(void)
         printk(KERN_INFO "%d pages shared\n", total_shared);
         printk(KERN_INFO "%d pages swap cached\n", total_cached);
         printk(KERN_INFO "Total of %ld pages in page table cache\n",
-               pgtable_quicklist_total_size());
+               quicklist_total_size());
         printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages());
 }
 
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 94844442812a..38085ac18338 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -561,7 +561,7 @@ void show_mem(void)
         printk(KERN_INFO "%d pages shared\n", total_shared);
         printk(KERN_INFO "%d pages swap cached\n", total_cached);
         printk(KERN_INFO "Total of %ld pages in page table cache\n",
-               pgtable_quicklist_total_size());
+               quicklist_total_size());
         printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages());
 }
 
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index cffb1e8325e8..c14abefabafa 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -39,9 +39,6 @@
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
-DEFINE_PER_CPU(unsigned long *, __pgtable_quicklist);
-DEFINE_PER_CPU(long, __pgtable_quicklist_size);
-
 extern void ia64_tlb_init (void);
 
 unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL;
@@ -56,54 +53,6 @@ EXPORT_SYMBOL(vmem_map);
 struct page *zero_page_memmap_ptr;      /* map entry for zero page */
 EXPORT_SYMBOL(zero_page_memmap_ptr);
 
-#define MIN_PGT_PAGES                   25UL
-#define MAX_PGT_FREES_PER_PASS          16L
-#define PGT_FRACTION_OF_NODE_MEM        16
-
-static inline long
-max_pgt_pages(void)
-{
-        u64 node_free_pages, max_pgt_pages;
-
-#ifndef CONFIG_NUMA
-        node_free_pages = nr_free_pages();
-#else
-        node_free_pages = node_page_state(numa_node_id(), NR_FREE_PAGES);
-#endif
-        max_pgt_pages = node_free_pages / PGT_FRACTION_OF_NODE_MEM;
-        max_pgt_pages = max(max_pgt_pages, MIN_PGT_PAGES);
-        return max_pgt_pages;
-}
-
-static inline long
-min_pages_to_free(void)
-{
-        long pages_to_free;
-
-        pages_to_free = pgtable_quicklist_size - max_pgt_pages();
-        pages_to_free = min(pages_to_free, MAX_PGT_FREES_PER_PASS);
-        return pages_to_free;
-}
-
-void
-check_pgt_cache(void)
-{
-        long pages_to_free;
-
-        if (unlikely(pgtable_quicklist_size <= MIN_PGT_PAGES))
-                return;
-
-        preempt_disable();
-        while (unlikely((pages_to_free = min_pages_to_free()) > 0)) {
-                while (pages_to_free--) {
-                        free_page((unsigned long)pgtable_quicklist_alloc());
-                }
-                preempt_enable();
-                preempt_disable();
-        }
-        preempt_enable();
-}
-
 void
 lazy_mmu_prot_update (pte_t pte)
 {