diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 10:56:43 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 10:56:43 +0100 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /arch/x86_64/ia32 | |
| parent | [MTD] bugfix: DataFlash is not bit writable (diff) | |
| parent | Linux 2.6.19 (diff) | |
| download | linux-bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb.tar.xz linux-bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86_64/ia32')
| -rw-r--r-- | arch/x86_64/ia32/ia32_signal.c | 5 | ||||
| -rw-r--r-- | arch/x86_64/ia32/ptrace32.c | 2 |
2 files changed, 7 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)); diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c index 3a7561d4703e..04566fe5de49 100644 --- a/arch/x86_64/ia32/ptrace32.c +++ b/arch/x86_64/ia32/ptrace32.c @@ -244,6 +244,8 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data) case PTRACE_DETACH: case PTRACE_SYSCALL: case PTRACE_SETOPTIONS: + case PTRACE_SET_THREAD_AREA: + case PTRACE_GET_THREAD_AREA: return sys_ptrace(request, pid, addr, data); default: |