aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorBodo Stroesser <bstroesser@fujitsu-siemens.com>2005-05-05 16:15:40 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 16:36:39 -0700
commit3a0a64e6c917b2ccc311cf978cc9d7eef7b31c47 (patch)
tree121b7de957b5cc73f8d0f1cd5fd70dcd1de04261 /arch/um
parent7c5131a501e9e8549f74d807c37fde76008ef95a (diff)
downloadkernel_samsung_espresso10-3a0a64e6c917b2ccc311cf978cc9d7eef7b31c47.zip
kernel_samsung_espresso10-3a0a64e6c917b2ccc311cf978cc9d7eef7b31c47.tar.gz
kernel_samsung_espresso10-3a0a64e6c917b2ccc311cf978cc9d7eef7b31c47.tar.bz2
[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>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/skas_ptrace.h15
-rw-r--r--arch/um/kernel/ptrace.c5
2 files changed, 2 insertions, 18 deletions
diff --git a/arch/um/include/skas_ptrace.h b/arch/um/include/skas_ptrace.h
index cfb5fb4..cd2327d 100644
--- 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 ec19fed..3efa59a 100644
--- 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: {