From: Bodo Stroesser <[email protected]>
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 <[email protected]>
Signed-off-by: Jeff Dike <[email protected]>
diff -puN arch/um/include/skas_ptrace.h~fix-skas_ptrace.h arch/um/include/skas_ptrace.h
--- linux-2.6.11/arch/um/include/skas_ptrace.h~fix-skas_ptrace.h 2005-04-06 14:22:17.000000000 +0200
+++ linux-2.6.11-root/arch/um/include/skas_ptrace.h 2005-04-06 14:22:17.000000000 +0200
@@ -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 -puN arch/um/kernel/ptrace.c~fix-skas_ptrace.h arch/um/kernel/ptrace.c
--- linux-2.6.11/arch/um/kernel/ptrace.c~fix-skas_ptrace.h 2005-04-06 14:22:17.000000000 +0200
+++ linux-2.6.11-root/arch/um/kernel/ptrace.c 2005-04-06 14:22:17.000000000 +0200
@@ -242,11 +242,6 @@ long sys_ptrace(long request, long pid,
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: {
_