diff options
| author | Albert Cahalan <acahalan@gmail.com> | 2006-10-30 04:26:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-30 21:12:21 +0100 |
| commit | a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3 (patch) | |
| tree | f39534927b66496a07e4804c8de277d182a30ba9 | |
| parent | [PATCH] fix "sunrpc: fix refcounting problems in rpc servers" (diff) | |
| download | linux-a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3.tar.xz linux-a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3.zip | |
[PATCH] fix i386 regparm=3 RT signal handlers on x86_64
The recent change to make x86_64 support i386 binaries compiled
with -mregparm=3 only covered signal handlers without SA_SIGINFO.
(the 3-arg "real-time" ones) This is useful for klibc at least.
Signed-off-by: Albert Cahalan <acahalan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/x86_64/ia32/ia32_signal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86_64/ia32/ia32_signal.c index a6ba9951e86c..0e0a266d976f 100644 --- a/arch/x86_64/ia32/ia32_signal.c +++ b/arch/x86_64/ia32/ia32_signal.c @@ -579,6 +579,11 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, regs->rsp = (unsigned long) frame; regs->rip = (unsigned long) ka->sa.sa_handler; + /* Make -mregparm=3 work */ + regs->rax = sig; + regs->rdx = (unsigned long) &frame->info; + regs->rcx = (unsigned long) &frame->uc; + asm volatile("movl %0,%%ds" :: "r" (__USER32_DS)); asm volatile("movl %0,%%es" :: "r" (__USER32_DS)); |