diff --git a/[refs] b/[refs] index 5ca3f40b377d..cdd7b5d68117 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c5131a501e9e8549f74d807c37fde76008ef95a +refs/heads/master: 3a0a64e6c917b2ccc311cf978cc9d7eef7b31c47 diff --git a/trunk/arch/um/include/skas_ptrace.h b/trunk/arch/um/include/skas_ptrace.h index cfb5fb4f5b91..cd2327d09c8d 100644 --- a/trunk/arch/um/include/skas_ptrace.h +++ b/trunk/arch/um/include/skas_ptrace.h @@ -6,22 +6,11 @@ #ifndef __SKAS_PTRACE_H #define __SKAS_PTRACE_H -struct ptrace_faultinfo { - int is_write; - unsigned long addr; -}; - -struct ptrace_ldt { - int func; - void *ptr; - unsigned long bytecount; -}; - #define PTRACE_FAULTINFO 52 -#define PTRACE_SIGPENDING 53 -#define PTRACE_LDT 54 #define PTRACE_SWITCH_MM 55 +#include "sysdep/skas_ptrace.h" + #endif /* diff --git a/trunk/arch/um/kernel/ptrace.c b/trunk/arch/um/kernel/ptrace.c index ec19fed7c64b..3efa59a941a4 100644 --- a/trunk/arch/um/kernel/ptrace.c +++ b/trunk/arch/um/kernel/ptrace.c @@ -263,11 +263,6 @@ long sys_ptrace(long request, long pid, long addr, long data) break; break; } - case PTRACE_SIGPENDING: - ret = copy_to_user((unsigned long __user *) data, - &child->pending.signal, - sizeof(child->pending.signal)); - break; #ifdef PTRACE_LDT case PTRACE_LDT: {