Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / include / asm-sparc64 / ttable.h

diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
index 6bb86a7a5b423e81edbd951716c7e6d0532cce1c..2d5e3c464df598ee7679eacd3c66b0bb987d9c2e 100644 (file)
--- a/include/asm-sparc64/ttable.h
+++ b/include/asm-sparc64/ttable.h
@@ -184,21 +184,21 @@
        ldxa    [%g0] ASI_SCRATCHPAD, %g2;              \
        ldx     [%g2 + HV_FAULT_I_ADDR_OFFSET], %g4;    \
        ldx     [%g2 + HV_FAULT_I_CTX_OFFSET], %g5;     \
-       srlx    %g4, 22, %g7;                           \
-       sllx    %g5, 48, %g6;                           \
-       brz,pn  %g5, kvmap_itlb_4v;                     \
-        or     %g6, %g7, %g6;                          \
-       ba,a,pt %xcc, sun4v_itsb_miss;
+       srlx    %g4, 22, %g6;                           \
+       ba,pt   %xcc, sun4v_itsb_miss;                  \
+        nop;                                           \
+       nop;                                            \
+       nop;
 
-#define SUN4V_DTSB_MISS                                \
+#define SUN4V_DTSB_MISS                                        \
        ldxa    [%g0] ASI_SCRATCHPAD, %g2;              \
        ldx     [%g2 + HV_FAULT_D_ADDR_OFFSET], %g4;    \
        ldx     [%g2 + HV_FAULT_D_CTX_OFFSET], %g5;     \
-       srlx    %g4, 22, %g7;                           \
-       sllx    %g5, 48, %g6;                           \
-       brz,pn  %g5, kvmap_dtlb_4v;                     \
-        or     %g6, %g7, %g6;                          \
-       ba,a,pt %xcc, sun4v_dtsb_miss;
+       srlx    %g4, 22, %g6;                           \
+       ba,pt   %xcc, sun4v_dtsb_miss;                  \
+        nop;                                           \
+       nop;                                            \
+       nop;
 
 /* Before touching these macros, you owe it to yourself to go and
  * see how arch/sparc64/kernel/winfixup.S works... -DaveM