commit a3170d2ec25f841bee1b52487693ac1a2f191ba6
author Al Viro <viro@zeniv.linux.org.uk> Tue May 22 21:16:35 2012 -0400
committer Richard Weinberger <richard@nod.at> Wed Aug 01 23:33:16 2012 +0200
tree 36b82a346087ef5050ca710ec38f8632dfa9deea
parent 2cad4c1276707ae06f40482bd91af513d23f5a6d

um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>

arch/um/kernel/process.c

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index ccb9a9d..f19ca61 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -193,7 +193,7 @@
 	if (current->thread.forking) {
 	  	memcpy(&p->thread.regs.regs, &regs->regs,
 		       sizeof(p->thread.regs.regs));
-		UPT_SET_SYSCALL_RETURN(&p->thread.regs.regs, 0);
+		PT_REGS_SET_SYSCALL_RETURN(&p->thread.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 05fbeb4..800551a 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);
 
-	UPT_SET_SYSCALL_RETURN(r, result);
+	PT_REGS_SET_SYSCALL_RETURN(regs, result);
 
 	syscall_trace(r, 1);
 }