openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Al Viro 2012-05-22 21:16:35 -04:00 committed by Richard Weinberger
parent 2cad4c1276
commit a3170d2ec2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/kernel/process.c
View File

@ -193,7 +193,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
if (current->thread.forking) { if (current->thread.forking) {
memcpy(&p->thread.regs.regs, &regs->regs, memcpy(&p->thread.regs.regs, &regs->regs,
sizeof(p->thread.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) if (sp != 0)
REGS_SP(p->thread.regs.regs.gp) = sp; REGS_SP(p->thread.regs.regs.gp) = sp;

2
arch/um/kernel/skas/syscall.c
View File

@ -34,7 +34,7 @@ void handle_syscall(struct uml_pt_regs *r)
result = -ENOSYS; result = -ENOSYS;
else result = EXECUTE_SYSCALL(syscall, regs); else result = EXECUTE_SYSCALL(syscall, regs);
UPT_SET_SYSCALL_RETURN(r, result); PT_REGS_SET_SYSCALL_RETURN(regs, result);
syscall_trace(r, 1); syscall_trace(r, 1);
} }

6
arch/x86/um/asm/ptrace.h
View File

@ -30,10 +30,10 @@
#define profile_pc(regs) PT_REGS_IP(regs) #define profile_pc(regs) PT_REGS_IP(regs)
#define UPT_RESTART_SYSCALL(r) (UPT_IP(r) -= 2) #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 */ #endif /* __UM_X86_PTRACE_H */