Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3170d2e authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 2cad4c12

arch/um/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,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));

		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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void handle_syscall(struct uml_pt_regs *r) 
		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);

}

arch/x86/um/asm/ptrace.h

+3 −3
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ 
#define profile_pc(regs) PT_REGS_IP(regs)



#define UPT_RESTART_SYSCALL(r) (UPT_IP(r) -= 2)

#define UPT_SET_SYSCALL_RETURN(r, res) (UPT_AX(r) = (res))

#define PT_REGS_SET_SYSCALL_RETURN(r, res) (PT_REGS_AX(r) = (res))



static inline long regs_return_value(struct uml_pt_regs *regs)

static inline long regs_return_value(struct pt_regs *regs)

{

	return UPT_AX(regs);

	return PT_REGS_AX(regs);

}

#endif /* __UM_X86_PTRACE_H */