From c17e33a8c6fa9a3f40ccfcece882ae2e694ea6b5 Mon Sep 17 00:00:00 2001
From: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Date: Thu, 28 Jul 2005 21:16:06 -0700
Subject: [PATCH] --- yaml --- r: 5407 b: refs/heads/master c:
 9057e9deee648cb2824d83b9eb7058edb5442a21 h: refs/heads/master i:   5405:
 27693033ea1591d655eb570b3ea6fc69154107b0   5403:
 f09ded1010a085b27834dba137bd7b73982bf9d6   5399:
 c8a50d906f43ab42ba0503026e0781b357c38b84   5391:
 844b471984d4eb9d9e8b81154985da2d9b5ae4db   5375:
 7e47747ab8fade628bb65fae39d5643f92556781 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/um/sys-i386/stub_segv.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 347027a088a1..cc60d9607d76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f313b12335abf010802751c45249e7a0007a232
+refs/heads/master: 9057e9deee648cb2824d83b9eb7058edb5442a21
diff --git a/trunk/arch/um/sys-i386/stub_segv.c b/trunk/arch/um/sys-i386/stub_segv.c
index b251442ad0b1..68aeabe3a654 100644
--- a/trunk/arch/um/sys-i386/stub_segv.c
+++ b/trunk/arch/um/sys-i386/stub_segv.c
@@ -21,10 +21,10 @@ stub_segv_handler(int sig)
 	__asm__("movl %0, %%eax ; int $0x80": : "g" (__NR_getpid));
 	__asm__("movl %%eax, %%ebx ; movl %0, %%eax ; movl %1, %%ecx ;"
 		"int $0x80": : "g" (__NR_kill), "g" (SIGUSR1));
-	/* Pop the frame pointer and return address since we need to leave
+	/* Load pointer to sigcontext into esp, since we need to leave
 	 * the stack in its original form when we do the sigreturn here, by
 	 * hand.
 	 */
-	__asm__("popl %%eax ; popl %%eax ; popl %%eax ; movl %0, %%eax ; "
-		"int $0x80" : : "g" (__NR_sigreturn));
+	__asm__("mov %0,%%esp ; movl %1, %%eax ; "
+		"int $0x80" : : "a" (sc), "g" (__NR_sigreturn));
 }