1 files changed, 21 insertions, 31 deletions

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 8e97e0305b01..62e3f5773303 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -467,33 +467,6 @@ void srmmu_unmapiorange(unsigned long virt_addr, unsigned int len)
         flush_tlb_all();
 }
 
-/*
- * On the SRMMU we do not have the problems with limited tlb entries
- * for mapping kernel pages, so we just take things from the free page
- * pool.  As a side effect we are putting a little too much pressure
- * on the gfp() subsystem.  This setup also makes the logic of the
- * iommu mapping code a lot easier as we can transparently handle
- * mappings on the kernel stack without any special code.
- */
-struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node)
-{
-        struct thread_info *ret;
-
-        ret = (struct thread_info *)__get_free_pages(GFP_KERNEL,
-                                                     THREAD_INFO_ORDER);
-#ifdef CONFIG_DEBUG_STACK_USAGE
-        if (ret)
-                memset(ret, 0, PAGE_SIZE << THREAD_INFO_ORDER);
-#endif /* DEBUG_STACK_USAGE */
-
-        return ret;
-}
-
-void free_thread_info(struct thread_info *ti)
-{
-        free_pages((unsigned long)ti, THREAD_INFO_ORDER);
-}
-
 /* tsunami.S */
 extern void tsunami_flush_cache_all(void);
 extern void tsunami_flush_cache_mm(struct mm_struct *mm);
@@ -673,6 +646,23 @@ static void __init srmmu_allocate_ptable_skeleton(unsigned long start,
         }
 }
 
+/* These flush types are not available on all chips... */
+static inline unsigned long srmmu_probe(unsigned long vaddr)
+{
+        unsigned long retval;
+
+        if (sparc_cpu_model != sparc_leon) {
+
+                vaddr &= PAGE_MASK;
+                __asm__ __volatile__("lda [%1] %2, %0\n\t" :
+                                     "=r" (retval) :
+                                     "r" (vaddr | 0x400), "i" (ASI_M_FLUSH_PROBE));
+        } else {
+                retval = leon_swprobe(vaddr, 0);
+        }
+        return retval;
+}
+
 /*
  * This is much cleaner than poking around physical address space
  * looking at the prom's page table directly which is what most
@@ -692,7 +682,7 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start,
                         break; /* probably wrap around */
                 if(start == 0xfef00000)
                         start = KADB_DEBUGGER_BEGVM;
-                if(!(prompte = srmmu_hwprobe(start))) {
+                if(!(prompte = srmmu_probe(start))) {
                         start += PAGE_SIZE;
                         continue;
                 }
@@ -701,12 +691,12 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start,
                 what = 0;
     
                 if(!(start & ~(SRMMU_REAL_PMD_MASK))) {
-                        if(srmmu_hwprobe((start-PAGE_SIZE) + SRMMU_REAL_PMD_SIZE) == prompte)
+                        if(srmmu_probe((start-PAGE_SIZE) + SRMMU_REAL_PMD_SIZE) == prompte)
                                 what = 1;
                 }
     
                 if(!(start & ~(SRMMU_PGDIR_MASK))) {
-                        if(srmmu_hwprobe((start-PAGE_SIZE) + SRMMU_PGDIR_SIZE) ==
+                        if(srmmu_probe((start-PAGE_SIZE) + SRMMU_PGDIR_SIZE) ==
                            prompte)
                                 what = 2;
                 }
@@ -1183,7 +1173,7 @@ static void turbosparc_flush_page_to_ram(unsigned long page)
 #ifdef TURBOSPARC_WRITEBACK
         volatile unsigned long clear;
 
-        if (srmmu_hwprobe(page))
+        if (srmmu_probe(page))
                 turbosparc_flush_page_cache(page);
         clear = srmmu_get_fstatus();
 #endif