---

yaml
---
r: 5407
b: refs/heads/master
c: 9057e9d
h: refs/heads/master
i:
  5405: 2769303
  5403: f09ded1
  5399: c8a50d9
  5391: 844b471
  5375: 7e47747
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f313b12335abf010802751c45249e7a0007a232
+refs/heads/master: 9057e9deee648cb2824d83b9eb7058edb5442a21

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));
 }