1 files changed, 9 insertions, 8 deletions

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 509b1ffeba66..f5f75a58e0b3 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -10,7 +10,6 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/init.h>
@@ -20,6 +19,7 @@
 #include <linux/seq_file.h>
 #include <linux/kdebug.h>
 #include <linux/log2.h>
+#include <linux/gfp.h>
 
 #include <asm/bitext.h>
 #include <asm/page.h>
@@ -694,7 +694,7 @@ extern void tsunami_setup_blockops(void);
  * The following code is a deadwood that may be necessary when
  * we start to make precise page flushes again. --zaitcev
  */
-static void swift_update_mmu_cache(struct vm_area_struct * vma, unsigned long address, pte_t pte)
+static void swift_update_mmu_cache(struct vm_area_struct * vma, unsigned long address, pte_t *ptep)
 {
 #if 0
         static unsigned long last;
@@ -703,10 +703,10 @@ static void swift_update_mmu_cache(struct vm_area_struct * vma, unsigned long ad
 
         if (address == last) {
                 val = srmmu_hwprobe(address);
-                if (val != 0 && pte_val(pte) != val) {
+                if (val != 0 && pte_val(*ptep) != val) {
                         printk("swift_update_mmu_cache: "
                             "addr %lx put %08x probed %08x from %p\n",
-                            address, pte_val(pte), val,
+                            address, pte_val(*ptep), val,
                             __builtin_return_address(0));
                         srmmu_flush_whole_tlb();
                 }
@@ -1990,7 +1990,7 @@ void __init poke_leonsparc(void)
 void __init init_leon(void)
 {
 
-        srmmu_name = "Leon";
+        srmmu_name = "LEON";
 
         BTFIXUPSET_CALL(flush_cache_all, leon_flush_cache_all,
                         BTFIXUPCALL_NORM);
@@ -2037,8 +2037,6 @@ static void __init get_srmmu_type(void)
 
         /* First, check for sparc-leon. */
         if (sparc_cpu_model == sparc_leon) {
-                psr_typ = 0xf;  /* hardcoded ids for older models/simulators */
-                psr_vers = 2;
                 init_leon();
                 return;
         }
@@ -2301,7 +2299,8 @@ void __init ld_mmu_srmmu(void)
         BTFIXUPSET_CALL(flush_cache_mm, smp_flush_cache_mm, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(flush_cache_range, smp_flush_cache_range, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(flush_cache_page, smp_flush_cache_page, BTFIXUPCALL_NORM);
-        if (sparc_cpu_model != sun4d) {
+        if (sparc_cpu_model != sun4d &&
+            sparc_cpu_model != sparc_leon) {
                 BTFIXUPSET_CALL(flush_tlb_all, smp_flush_tlb_all, BTFIXUPCALL_NORM);
                 BTFIXUPSET_CALL(flush_tlb_mm, smp_flush_tlb_mm, BTFIXUPCALL_NORM);
                 BTFIXUPSET_CALL(flush_tlb_range, smp_flush_tlb_range, BTFIXUPCALL_NORM);
@@ -2330,6 +2329,8 @@ void __init ld_mmu_srmmu(void)
 #ifdef CONFIG_SMP
         if (sparc_cpu_model == sun4d)
                 sun4d_init_smp();
+        else if (sparc_cpu_model == sparc_leon)
+                leon_init_smp();
         else
                 sun4m_init_smp();
 #endif