diff --git a/[refs] b/[refs]
index 222cac03194f..55203c564686 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd54a11004b2c9a1f136225f880e021a43b0eadc
+refs/heads/master: 536e3ee4fed13d2d4bbf1b775174aba0cadf6aba
diff --git a/trunk/arch/x86_64/ia32/ia32_signal.c b/trunk/arch/x86_64/ia32/ia32_signal.c
index 2d20f8304b31..ced15012a3d7 100644
--- a/trunk/arch/x86_64/ia32/ia32_signal.c
+++ b/trunk/arch/x86_64/ia32/ia32_signal.c
@@ -478,6 +478,11 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
 	regs->rsp = (unsigned long) frame;
 	regs->rip = (unsigned long) ka->sa.sa_handler;
 
+	/* Make -mregparm=3 work */
+	regs->rax = sig;
+	regs->rdx = 0;
+	regs->rcx = 0;
+
 	asm volatile("movl %0,%%ds" :: "r" (__USER32_DS)); 
 	asm volatile("movl %0,%%es" :: "r" (__USER32_DS));