1 files changed, 13 insertions, 5 deletions

diff --git a/arch/sparc/kernel/etrap_32.S b/arch/sparc/kernel/etrap_32.S
index 84b5f0d2afde..e3e80d65e39a 100644
--- a/arch/sparc/kernel/etrap_32.S
+++ b/arch/sparc/kernel/etrap_32.S
@@ -234,7 +234,8 @@ tsetup_srmmu_stackchk:
 
         cmp     %glob_tmp, %sp
         bleu,a  1f
-         lda    [%g0] ASI_M_MMUREGS, %glob_tmp          ! read MMU control
+LEON_PI( lda    [%g0] ASI_LEON_MMUREGS, %glob_tmp)      ! read MMU control
+SUN_PI_( lda    [%g0] ASI_M_MMUREGS, %glob_tmp)         ! read MMU control
 
 trap_setup_user_stack_is_bolixed:
         /* From user/kernel into invalid window w/bad user
@@ -249,18 +250,25 @@ trap_setup_user_stack_is_bolixed:
 1:
         /* Clear the fault status and turn on the no_fault bit. */
         or      %glob_tmp, 0x2, %glob_tmp               ! or in no_fault bit
-        sta     %glob_tmp, [%g0] ASI_M_MMUREGS          ! set it
+LEON_PI(sta     %glob_tmp, [%g0] ASI_LEON_MMUREGS)              ! set it
+SUN_PI_(sta     %glob_tmp, [%g0] ASI_M_MMUREGS)         ! set it
 
         /* Dump the registers and cross fingers. */
         STORE_WINDOW(sp)
 
         /* Clear the no_fault bit and check the status. */
         andn    %glob_tmp, 0x2, %glob_tmp
-        sta     %glob_tmp, [%g0] ASI_M_MMUREGS
+LEON_PI(sta     %glob_tmp, [%g0] ASI_LEON_MMUREGS)
+SUN_PI_(sta     %glob_tmp, [%g0] ASI_M_MMUREGS)
+
         mov     AC_M_SFAR, %glob_tmp
-        lda     [%glob_tmp] ASI_M_MMUREGS, %g0
+LEON_PI(lda     [%glob_tmp] ASI_LEON_MMUREGS, %g0)
+SUN_PI_(lda     [%glob_tmp] ASI_M_MMUREGS, %g0)
+
         mov     AC_M_SFSR, %glob_tmp
-        lda     [%glob_tmp] ASI_M_MMUREGS, %glob_tmp    ! save away status of winstore
+LEON_PI(lda     [%glob_tmp] ASI_LEON_MMUREGS, %glob_tmp)! save away status of winstore
+SUN_PI_(lda     [%glob_tmp] ASI_M_MMUREGS, %glob_tmp)   ! save away status of winstore
+
         andcc   %glob_tmp, 0x2, %g0                     ! did we fault?
         bne     trap_setup_user_stack_is_bolixed        ! failure
          nop