From 93051344a52b69a08168a813fb9fedda4e5950c8 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:06:49 +0100 Subject: [PATCH] --- yaml --- r: 273019 b: refs/heads/master c: 0acdbbeb6dd435f5f3f1648fc3a2ab5fd07b5545 h: refs/heads/master i: 273017: 1468561bc3be5ca3b3d3a3607cac57993186b9df 273015: 0f126f54a8bff8a6679bbc7aefa26b86807b6a13 v: v3 --- [refs] | 2 +- trunk/arch/um/include/asm/ptrace-generic.h | 4 ---- trunk/arch/x86/um/shared/sysdep/ptrace_32.h | 3 --- trunk/arch/x86/um/shared/sysdep/ptrace_64.h | 3 --- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 812e36c213ef..de4505242749 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c48b108ecbf6505d929e64d50dace13ac2bdf34 +refs/heads/master: 0acdbbeb6dd435f5f3f1648fc3a2ab5fd07b5545 diff --git a/trunk/arch/um/include/asm/ptrace-generic.h b/trunk/arch/um/include/asm/ptrace-generic.h index c3b8a041c13f..f605d3c4844c 100644 --- a/trunk/arch/um/include/asm/ptrace-generic.h +++ b/trunk/arch/um/include/asm/ptrace-generic.h @@ -23,14 +23,10 @@ struct pt_regs { #define PT_REGS_IP(r) UPT_IP(&(r)->regs) #define PT_REGS_SP(r) UPT_SP(&(r)->regs) -#define PT_REGS_SET_SYSCALL_RETURN(r, res) \ - UPT_SET_SYSCALL_RETURN(&(r)->regs, res) #define PT_REGS_RESTART_SYSCALL(r) UPT_RESTART_SYSCALL(&(r)->regs) #define PT_REGS_SYSCALL_NR(r) UPT_SYSCALL_NR(&(r)->regs) -#define PT_REGS_SC(r) UPT_SC(&(r)->regs) - #define instruction_pointer(regs) PT_REGS_IP(regs) struct task_struct; diff --git a/trunk/arch/x86/um/shared/sysdep/ptrace_32.h b/trunk/arch/x86/um/shared/sysdep/ptrace_32.h index ce77fa1e2a15..bad747a239cd 100644 --- a/trunk/arch/x86/um/shared/sysdep/ptrace_32.h +++ b/trunk/arch/x86/um/shared/sysdep/ptrace_32.h @@ -101,9 +101,6 @@ struct syscall_args { UPT_SYSCALL_ARG5(r), \ UPT_SYSCALL_ARG6(r) } } ) -#define UPT_SET_SYSCALL_RETURN(r, res) \ - REGS_SET_SYSCALL_RETURN((r)->regs, (res)) - #define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->gp) #define UPT_ORIG_SYSCALL(r) UPT_EAX(r) diff --git a/trunk/arch/x86/um/shared/sysdep/ptrace_64.h b/trunk/arch/x86/um/shared/sysdep/ptrace_64.h index 866fe7e47369..a360fe25431a 100644 --- a/trunk/arch/x86/um/shared/sysdep/ptrace_64.h +++ b/trunk/arch/x86/um/shared/sysdep/ptrace_64.h @@ -146,9 +146,6 @@ struct syscall_args { UPT_SYSCALL_ARG5(r), \ UPT_SYSCALL_ARG6(r) } } ) -#define UPT_SET_SYSCALL_RETURN(r, res) \ - REGS_SET_SYSCALL_RETURN((r)->regs, (res)) - #define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->gp) #define UPT_FAULTINFO(r) (&(r)->faultinfo)