[PATCH] uml: header and code cleanup

Remove some definitions and declarations from arch/um/include/skas_ptrace.h,
as they have moved to arch/um/include/sysdep/skas_ptrace.h

Also, remove PTRACE_SIGPENDING support in UML at all.

Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/include/skas_ptrace.h b/arch/um/include/skas_ptrace.h
index cfb5fb4f5b91ff4202ef109c10468d40b31ca43d..cd2327d09c8dfe669732182bf7e4e8537a2e6482 100644 (file)
--- a/arch/um/include/skas_ptrace.h
+++ b/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/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index ec19fed7c64b6f398f372eca58d6859ba8db24bf..3efa59a941a44dcbb0e8cd70781115a805164267 100644 (file)
--- a/arch/um/kernel/ptrace.c
+++ b/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: {