summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-05-20 00:05:58 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-21 16:28:34 -0400
commit243412be9cecfc7fddebb912a277b76119fd4ecd (patch)
treeb74b7d87db67aed2a22acb7571a4349d3507f9b3 /arch/um
parentc6802f4370510fa8674674f11c5578ee057d1d63 (diff)
downloadlinux-243412be9cecfc7fddebb912a277b76119fd4ecd.tar.gz
linux-243412be9cecfc7fddebb912a277b76119fd4ecd.tar.bz2
linux-243412be9cecfc7fddebb912a277b76119fd4ecd.zip
um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/kernel/process.c2
-rw-r--r--arch/um/kernel/skas/syscall.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 4d9af3172d9f..3a2235e0abc3 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -196,7 +196,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
if (current->thread.forking) {
memcpy(&p->thread.regs.regs, &regs->regs,
sizeof(p->thread.regs.regs));
- REGS_SET_SYSCALL_RETURN(p->thread.regs.regs.gp, 0);
+ UPT_SET_SYSCALL_RETURN(&p->thread.regs.regs, 0);
if (sp != 0)
REGS_SP(p->thread.regs.regs.gp) = sp;
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index f5173e1ec3ac..05fbeb480e0b 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -34,7 +34,7 @@ void handle_syscall(struct uml_pt_regs *r)
result = -ENOSYS;
else result = EXECUTE_SYSCALL(syscall, regs);
- REGS_SET_SYSCALL_RETURN(r->gp, result);
+ UPT_SET_SYSCALL_RETURN(r, result);
syscall_trace(r, 1);
}