---

yaml --- r: 1300 b: refs/heads/master c: 607a168 h: refs/heads/master v: v3
git-mirror · May 20, 2005 · ee1c11a · ee1c11a
1 parent d626c39
commit ee1c11a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4057923614e2868a865aa6c6e3bc53542c818d4d
+refs/heads/master: 607a16858397829806c5a4db999ce6daf327f98c
diff --git a/trunk/arch/x86_64/kernel/signal.c b/trunk/arch/x86_64/kernel/signal.c
@@ -452,7 +452,9 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 			regs->rip -= 2;
 		}
 		if (regs->rax == (unsigned long)-ERESTART_RESTARTBLOCK) {
-			regs->rax = __NR_restart_syscall;
+			regs->rax = test_thread_flag(TIF_IA32) ?
+					__NR_ia32_restart_syscall :
+					__NR_restart_syscall;
 			regs->rip -= 2;
 		}
 	}