---

yaml
---
r: 340249
b: refs/heads/master
c: 32942bc
h: refs/heads/master
i:
  340247: 5408c09
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb48ffcf0e55e511ae87e9d99117d5e2b9e27153
+refs/heads/master: 32942bc7a609a874f462e1168dbeae20dbc6b79f

trunk/arch/sparc/kernel/entry.S

@@ -959,17 +959,9 @@ flush_patch_four:
         .align  4
 linux_sparc_ni_syscall:
 	sethi   %hi(sys_ni_syscall), %l7
-	b       syscall_is_too_hard
+	b       do_syscall
 	 or     %l7, %lo(sys_ni_syscall), %l7
 
-linux_fast_syscall:
-	andn	%l7, 3, %l7
-	mov	%i0, %o0
-	mov	%i1, %o1
-	mov 	%i2, %o2
-	jmpl	%l7 + %g0, %g0
-	 mov	%i3, %o3
-
 linux_syscall_trace:
 	add	%sp, STACKFRAME_SZ, %o0
 	call	syscall_trace
@@ -1002,11 +994,8 @@ linux_sparc_syscall:
 	bgeu	linux_sparc_ni_syscall
 	 sll	%g1, 2, %l4
 	ld	[%l7 + %l4], %l7
-	andcc	%l7, 1, %g0
-	bne	linux_fast_syscall
-	 /* Just do first insn from SAVE_ALL in the delay slot */
 
-syscall_is_too_hard:
+do_syscall:
 	SAVE_ALL_HEAD
 	 rd	%wim, %l3