[SPARC64]: Fix bogus flush instruction usage.

Some of the trap code was still assuming that alternate
global %g6 was hard coded with current_thread_info().
Let's just consistently flush at KERNBASE when we need
a pipeline synchronization.  That's locked into the TLB
and will always work.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 8 insertions, 4 deletions

diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S
index 8b3b6d720ed5..db7681017299 100644
--- a/arch/sparc64/kernel/etrap.S
+++ b/arch/sparc64/kernel/etrap.S
@@ -72,7 +72,8 @@ etrap_irq:
                 sethi   %hi(sparc64_kern_pri_context), %g2
                 ldx     [%g2 + %lo(sparc64_kern_pri_context)], %g3
                 stxa    %g3, [%l4] ASI_DMMU
-                flush   %l6
+                sethi   %hi(KERNBASE), %l4
+                flush   %l4
                 wr      %g0, ASI_AIUS, %asi
 2:              wrpr    %g0, 0x0, %tl
                 mov     %g4, %l4
@@ -215,7 +216,8 @@ scetrap:
                 sethi   %hi(sparc64_kern_pri_context), %g2
                 ldx     [%g2 + %lo(sparc64_kern_pri_context)], %g3
                 stxa    %g3, [%l4] ASI_DMMU
-                flush   %l6
+                sethi   %hi(KERNBASE), %l4
+                flush   %l4
 
                 mov     ASI_AIUS, %l7
 2:              mov     %g4, %l4
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index 5a62ec5d531c..89794ebdcbcf 100644
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
@@ -259,7 +259,8 @@ rt_continue:	ldx			[%sp + PTREGS_OFF + PT_V9_G1], %g1
                 ldx                     [%l1 + %lo(sparc64_kern_pri_nuc_bits)], %l1
                 or                      %l0, %l1, %l0
                 stxa                    %l0, [%l7] ASI_DMMU
-                flush                   %g6
+                sethi                   %hi(KERNBASE), %l7
+                flush                   %l7
                 rdpr                    %wstate, %l1
                 rdpr                    %otherwin, %l2
                 srl                     %l1, 3, %l1
diff --git a/arch/sparc64/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S
index de588036df43..c0545d089c96 100644
--- a/arch/sparc64/kernel/winfixup.S
+++ b/arch/sparc64/kernel/winfixup.S
@@ -20,7 +20,8 @@ set_pcontext:
         ldx     [%l1 + %lo(sparc64_kern_pri_context)], %l1
         mov     PRIMARY_CONTEXT, %g1
         stxa    %l1, [%g1] ASI_DMMU
-        flush   %g6
+        sethi   %hi(KERNBASE), %l1
+        flush   %l1
         retl
          nop