commit 243412be9cecfc7fddebb912a277b76119fd4ecd
author Al Viro <viro@zeniv.linux.org.uk> Sun May 20 00:05:58 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Mon May 21 16:28:34 2012 -0400
tree b74b7d87db67aed2a22acb7571a4349d3507f9b3
parent c6802f4370510fa8674674f11c5578ee057d1d63

um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

arch/um/kernel/process.c

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 4d9af31..3a2235e 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -196,7 +196,7 @@
 	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;
 

arch/um/kernel/skas/syscall.c

diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index f5173e1..05fbeb4 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -34,7 +34,7 @@
 		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);
 }