From ee1c11a5324187a45ebd8ea9086561c52852566b Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Fri, 20 May 2005 14:27:58 -0700
Subject: [PATCH] --- yaml --- r: 1300 b: refs/heads/master c:
 607a16858397829806c5a4db999ce6daf327f98c h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86_64/kernel/signal.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 13bbe751f739..fce2e87d0be4 100644
--- 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
index d439ced150c6..3fdcdba0fec5 100644
--- 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;
 		}
 	}