aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBodo Stroesser <bstroesser@fujitsu-siemens.com>2005-05-05 19:15:40 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 19:36:39 -0400
commit3a0a64e6c917b2ccc311cf978cc9d7eef7b31c47 (patch)
tree121b7de957b5cc73f8d0f1cd5fd70dcd1de04261
parent7c5131a501e9e8549f74d807c37fde76008ef95a (diff)
[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>
-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 cfb5fb4f5b91..cd2327d09c8d 100644
--- a/arch/um/include/skas_ptrace.h
+++ b/arch/um/include/skas_ptrace.h
@@ -6,22 +6,11 @@
6#ifndef __SKAS_PTRACE_H 6#ifndef __SKAS_PTRACE_H
7#define __SKAS_PTRACE_H 7#define __SKAS_PTRACE_H
8 8
9struct ptrace_faultinfo {
10 int is_write;
11 unsigned long addr;
12};
13
14struct ptrace_ldt {
15 int func;
16 void *ptr;
17 unsigned long bytecount;
18};
19
20#define PTRACE_FAULTINFO 52 9#define PTRACE_FAULTINFO 52
21#define PTRACE_SIGPENDING 53
22#define PTRACE_LDT 54
23#define PTRACE_SWITCH_MM 55 10#define PTRACE_SWITCH_MM 55
24 11
12#include "sysdep/skas_ptrace.h"
13
25#endif 14#endif
26 15
27/* 16/*
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index ec19fed7c64b..3efa59a941a4 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)
263 break; 263 break;
264 break; 264 break;
265 } 265 }
266 case PTRACE_SIGPENDING:
267 ret = copy_to_user((unsigned long __user *) data,
268 &child->pending.signal,
269 sizeof(child->pending.signal));
270 break;
271 266
272#ifdef PTRACE_LDT 267#ifdef PTRACE_LDT
273 case PTRACE_LDT: { 268 case PTRACE_LDT: {