2 files changed, 15 insertions, 21 deletions

diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 3c06bfb92a8c..f1f01378d079 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -241,10 +241,6 @@ EXPORT_SYMBOL(verify_compat_iovec);
 #endif
 
 EXPORT_SYMBOL(dump_fpu);
-EXPORT_SYMBOL(pte_alloc_one_kernel);
-#ifndef CONFIG_SMP
-EXPORT_SYMBOL(pgt_quicklists);
-#endif
 EXPORT_SYMBOL(put_fs_struct);
 
 /* math-emu wants this */
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 936ae1a594ac..7c456afaa9a5 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -141,26 +141,25 @@ unsigned long sparc64_kern_sec_context __read_mostly;
 
 int bigkernel = 0;
 
-/* XXX Tune this... */
-#define PGT_CACHE_LOW   25
-#define PGT_CACHE_HIGH  50
+kmem_cache_t *pgtable_cache __read_mostly;
 
-#ifndef CONFIG_SMP
-struct pgtable_cache_struct pgt_quicklists;
-#endif
+static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags)
+{
+        clear_page(addr);
+}
 
-void check_pgt_cache(void)
+void pgtable_cache_init(void)
 {
-        preempt_disable();
-        if (pgtable_cache_size > PGT_CACHE_HIGH) {
-                do {
-                        if (pgd_quicklist)
-                                free_pgd_slow(get_pgd_fast());
-                        if (pte_quicklist)
-                                free_pte_slow(pte_alloc_one_fast());
-                } while (pgtable_cache_size > PGT_CACHE_LOW);
+        pgtable_cache = kmem_cache_create("pgtable_cache",
+                                          PAGE_SIZE, PAGE_SIZE,
+                                          SLAB_HWCACHE_ALIGN |
+                                          SLAB_MUST_HWCACHE_ALIGN,
+                                          zero_ctor,
+                                          NULL);
+        if (!pgtable_cache) {
+                prom_printf("pgtable_cache_init(): Could not create!\n");
+                prom_halt();
         }
-        preempt_enable();
 }
 
 #ifdef CONFIG_DEBUG_DCFLUSH
@@ -340,7 +339,6 @@ void show_mem(void)
                nr_swap_pages << (PAGE_SHIFT-10));
         printk("%ld pages of RAM\n", num_physpages);
         printk("%d free pages\n", nr_free_pages());
-        printk("%d pages in page table cache\n",pgtable_cache_size);
 }
 
 void mmu_info(struct seq_file *m)