From 6606361143ed886355c4bf8816a8ff51bdb25367 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 10 May 2008 21:11:23 -0700 Subject: [PATCH] --- yaml --- r: 96379 b: refs/heads/master c: 986bef854fab44012df678a5b51817d5274d3ca1 h: refs/heads/master i: 96377: ecae8fed0dfc21973b3a0bd1ad4a31d1ebda1997 96375: 7e6d6c7f0684038c129ba7cb8f49e158b607dfa6 v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/ptrace.c | 2 ++ trunk/arch/sparc64/kernel/ptrace.c | 4 ++++ trunk/include/asm-sparc/ptrace.h | 1 + trunk/include/asm-sparc64/ptrace.h | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 38c8faa5e66e..3ce441c2670c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c07c6053c41f736711ed856aa377007078c7c396 +refs/heads/master: 986bef854fab44012df678a5b51817d5274d3ca1 diff --git a/trunk/arch/sparc/kernel/ptrace.c b/trunk/arch/sparc/kernel/ptrace.c index 7f44ae69b29e..60dfc65549db 100644 --- a/trunk/arch/sparc/kernel/ptrace.c +++ b/trunk/arch/sparc/kernel/ptrace.c @@ -441,6 +441,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) break; default: + if (request == PTRACE_SPARC_DETACH) + request = PTRACE_DETACH; ret = ptrace_request(child, request, addr, data); break; } diff --git a/trunk/arch/sparc64/kernel/ptrace.c b/trunk/arch/sparc64/kernel/ptrace.c index e9fc0aa2da38..b803fe9b2c8d 100644 --- a/trunk/arch/sparc64/kernel/ptrace.c +++ b/trunk/arch/sparc64/kernel/ptrace.c @@ -944,6 +944,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, break; default: + if (request == PTRACE_SPARC_DETACH) + request = PTRACE_DETACH; ret = compat_ptrace_request(child, request, addr, data); break; } @@ -1036,6 +1038,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) break; default: + if (request == PTRACE_SPARC_DETACH) + request = PTRACE_DETACH; ret = ptrace_request(child, request, addr, data); break; } diff --git a/trunk/include/asm-sparc/ptrace.h b/trunk/include/asm-sparc/ptrace.h index 8201a7b29d49..c25334234a6f 100644 --- a/trunk/include/asm-sparc/ptrace.h +++ b/trunk/include/asm-sparc/ptrace.h @@ -149,6 +149,7 @@ extern void show_regs(struct pt_regs *); #define SF_XXARG 0x5c /* Stuff for the ptrace system call */ +#define PTRACE_SPARC_DETACH 11 #define PTRACE_GETREGS 12 #define PTRACE_SETREGS 13 #define PTRACE_GETFPREGS 14 diff --git a/trunk/include/asm-sparc64/ptrace.h b/trunk/include/asm-sparc64/ptrace.h index 714b81956f32..823656559d1a 100644 --- a/trunk/include/asm-sparc64/ptrace.h +++ b/trunk/include/asm-sparc64/ptrace.h @@ -298,6 +298,7 @@ extern void __show_regs(struct pt_regs *); #define SF_XXARG 0x5c /* Stuff for the ptrace system call */ +#define PTRACE_SPARC_DETACH 11 #define PTRACE_GETREGS 12 #define PTRACE_SETREGS 13 #define PTRACE_GETFPREGS 14