[PATCH 22/22] UML - Header and code cleanup

[Jeff Dike]

From: Bodo Stroesser <bstroesser@xxxxxxxxxxxxxxxxxxx>

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@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>

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: {
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/