Merge bk://ppc.bkbits.net/for-linus-ppc

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://ppc.bkbits.net/for-linus-ppc
into home.transmeta.com:/home/torvalds/v2.5/linux
1d8c1ffb · Linus Torvalds · f14e0fb9 · 8af12c31 · 1d8c1ffb
Commit 1d8c1ffb authored Jun 24, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

arch/ppc/kernel/entry.S arch/ppc/kernel/entry.S +0 -3

No files found.
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -200,9 +200,6 @@ ret_from_syscall:
 	andi.	r11,r11,_TIF_FORCE_NOERROR
 	bne	30f
 	neg	r3,r3
-	cmpi	0,r3,ERESTARTNOHAND
-	bne	22f
-	li	r3,EINTR
 22:	lwz	r10,_CCR(r1)	/* Set SO bit in CR */
 	oris	r10,r10,0x1000
 	stw	r10,_CCR(r1)