1 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
index 7208a777750e..d3cc4eff39a6 100644
--- a/include/asm-sparc64/ttable.h
+++ b/include/asm-sparc64/ttable.h
@@ -28,7 +28,7 @@
        call    routine;                                \
         add    %sp, PTREGS_OFF, %o0;                   \
        ba,pt   %xcc, rtrap;                            \
-         clr    %l6;                                    \
+         nop;                                           \
        nop;
 #define TRAP_7INSNS(routine)                            \
@@ -38,7 +38,7 @@
        call    routine;                                \
         add    %sp, PTREGS_OFF, %o0;                   \
        ba,pt   %xcc, rtrap;                            \
-         clr    %l6;
+         nop;
 #define TRAP_SAVEFPU(routine)                           \
        sethi   %hi(109f), %g7;                         \
@@ -47,7 +47,7 @@
        call    routine;                                \
         add    %sp, PTREGS_OFF, %o0;                   \
        ba,pt   %xcc, rtrap;                            \
-         clr    %l6;                                    \
+         nop;                                           \
        nop;
 #define TRAP_NOSAVE(routine)                            \
@@ -67,7 +67,7 @@
        call    routine;                                \
         add    %sp, PTREGS_OFF, %o0;                   \
        ba,pt   %xcc, rtrap;                            \
-         clr    %l6;                                    \
+         nop;                                           \
        nop;
        
 #define TRAP_ARG(routine, arg)                          \
@@ -78,7 +78,7 @@
        call    routine;                                \
         mov    arg, %o1;                               \
        ba,pt   %xcc, rtrap;                            \
-         clr    %l6;
+         nop;
        
 #define TRAPTL1_ARG(routine, arg)                       \
        sethi   %hi(109f), %g7;                         \
@@ -88,7 +88,7 @@
        call    routine;                                \
         mov    arg, %o1;                               \
        ba,pt   %xcc, rtrap;                            \
-         clr    %l6;
+         nop;
        
 #define SYSCALL_TRAP(routine, systbl)                   \
        sethi   %hi(109f), %g7;                         \
@@ -166,7 +166,7 @@
        ldx     [%sp + PTREGS_OFF + PT_V9_TNPC], %l1;                   \
        add     %l1, 4, %l2;                                            \
        stx     %l1, [%sp + PTREGS_OFF + PT_V9_TPC];                    \
-        ba,pt   %xcc, rtrap_clr_l6;                                     \
+        ba,pt   %xcc, rtrap;                                            \
         stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC];
                
 #ifdef CONFIG_KPROBES

diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h index 7208a777750e..d3cc4eff39a6 100644 --- a/include/asm-sparc64/ttable.h +++ b/include/asm-sparc64/ttable.h
@@ -28,7 +28,7 @@
28	call routine; \	28	call routine; \
29	add %sp, PTREGS_OFF, %o0; \	29	add %sp, PTREGS_OFF, %o0; \
30	ba,pt %xcc, rtrap; \	30	ba,pt %xcc, rtrap; \
31	clr %l6; \	31	nop; \
32	nop;	32	nop;
33		33
34	#define TRAP_7INSNS(routine) \	34	#define TRAP_7INSNS(routine) \
@@ -38,7 +38,7 @@
38	call routine; \	38	call routine; \
39	add %sp, PTREGS_OFF, %o0; \	39	add %sp, PTREGS_OFF, %o0; \
40	ba,pt %xcc, rtrap; \	40	ba,pt %xcc, rtrap; \
41	clr %l6;	41	nop;
42		42
43	#define TRAP_SAVEFPU(routine) \	43	#define TRAP_SAVEFPU(routine) \
44	sethi %hi(109f), %g7; \	44	sethi %hi(109f), %g7; \
@@ -47,7 +47,7 @@
47	call routine; \	47	call routine; \
48	add %sp, PTREGS_OFF, %o0; \	48	add %sp, PTREGS_OFF, %o0; \
49	ba,pt %xcc, rtrap; \	49	ba,pt %xcc, rtrap; \
50	clr %l6; \	50	nop; \
51	nop;	51	nop;
52		52
53	#define TRAP_NOSAVE(routine) \	53	#define TRAP_NOSAVE(routine) \
@@ -67,7 +67,7 @@
67	call routine; \	67	call routine; \
68	add %sp, PTREGS_OFF, %o0; \	68	add %sp, PTREGS_OFF, %o0; \
69	ba,pt %xcc, rtrap; \	69	ba,pt %xcc, rtrap; \
70	clr %l6; \	70	nop; \
71	nop;	71	nop;
72		72
73	#define TRAP_ARG(routine, arg) \	73	#define TRAP_ARG(routine, arg) \
@@ -78,7 +78,7 @@
78	call routine; \	78	call routine; \
79	mov arg, %o1; \	79	mov arg, %o1; \
80	ba,pt %xcc, rtrap; \	80	ba,pt %xcc, rtrap; \
81	clr %l6;	81	nop;
82		82
83	#define TRAPTL1_ARG(routine, arg) \	83	#define TRAPTL1_ARG(routine, arg) \
84	sethi %hi(109f), %g7; \	84	sethi %hi(109f), %g7; \
@@ -88,7 +88,7 @@
88	call routine; \	88	call routine; \
89	mov arg, %o1; \	89	mov arg, %o1; \
90	ba,pt %xcc, rtrap; \	90	ba,pt %xcc, rtrap; \
91	clr %l6;	91	nop;
92		92
93	#define SYSCALL_TRAP(routine, systbl) \	93	#define SYSCALL_TRAP(routine, systbl) \
94	sethi %hi(109f), %g7; \	94	sethi %hi(109f), %g7; \
@@ -166,7 +166,7 @@
166	ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1; \	166	ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1; \
167	add %l1, 4, %l2; \	167	add %l1, 4, %l2; \
168	stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC]; \	168	stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC]; \
169	ba,pt %xcc, rtrap_clr_l6; \	169	ba,pt %xcc, rtrap; \
170	stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC];	170	stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC];
171		171
172	#ifdef CONFIG_KPROBES	172	#ifdef CONFIG_KPROBES