Skip to content

L
linux
Commit 1d8c1ffb authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents f14e0fb9 8af12c31
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
arch/ppc/kernel/entry.S
View file @ 1d8c1ffb
...@@ -200,9 +200,6 @@ ret_from_syscall: ...@@ -200,9 +200,6 @@ ret_from_syscall:
andi. r11,r11,_TIF_FORCE_NOERROR andi. r11,r11,_TIF_FORCE_NOERROR
bne 30f bne 30f
neg r3,r3 neg r3,r3
cmpi 0,r3,ERESTARTNOHAND
bne 22f
li r3,EINTR
22: lwz r10,_CCR(r1) /* Set SO bit in CR */ 22: lwz r10,_CCR(r1) /* Set SO bit in CR */
oris r10,r10,0x1000 oris r10,r10,0x1000
stw r10,_CCR(r1) stw r10,_CCR(r1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7