diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-06 22:08:18 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-07 02:59:22 -0800 |
| commit | 190aa9f60f9575d1b7382cd1ee33e2589208c514 (patch) | |
| tree | 2707306174f13b26751f6264a4fceee00ef26ed1 | |
| parent | 38282764e3e76aa02c071af4673e6b6320e426ad (diff) | |
| download | kernel-crypto-190aa9f60f9575d1b7382cd1ee33e2589208c514.tar.gz kernel-crypto-190aa9f60f9575d1b7382cd1ee33e2589208c514.tar.xz kernel-crypto-190aa9f60f9575d1b7382cd1ee33e2589208c514.zip | |
[SPARC]: Remove PTRACE_SUN* handling.
Supporting SunOS ptrace() is pretty pointless and these
kinds of quirks keep us from being able to share more
code with other platforms.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/ptrace.c | 15 | ||||
| -rw-r--r-- | arch/sparc64/kernel/ptrace.c | 15 | ||||
| -rw-r--r-- | include/asm-sparc/ptrace.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/ptrace.h | 2 |
4 files changed, 2 insertions, 32 deletions
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c index 0619958ecfd..29fa6e5cb45 100644 --- a/arch/sparc/kernel/ptrace.c +++ b/arch/sparc/kernel/ptrace.c @@ -556,8 +556,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs) goto out; } - if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH) - || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) { + if (request == PTRACE_ATTACH) { if (ptrace_attach(child)) { pt_error_return(regs, EPERM); goto out_tsk; @@ -789,18 +788,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs) goto out_tsk; } - case PTRACE_SUNDETACH: { /* detach a process that was attached. */ - int err = ptrace_detach(child, data); - if (err) { - pt_error_return(regs, EIO); - goto out_tsk; - } - pt_succ_return(regs, 0); - goto out_tsk; - } - - /* PTRACE_DUMPCORE unsupported... */ - default: { int err = ptrace_request(child, request, addr, data); if (err) diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index 2232e85c841..e881dbbd2c4 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c @@ -766,8 +766,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs) goto out; } - if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH) - || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) { + if (request == PTRACE_ATTACH) { if (ptrace_attach(child)) { pt_error_return(regs, EPERM); goto out_tsk; @@ -1137,18 +1136,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs) goto out_tsk; } - case PTRACE_SUNDETACH: { /* detach a process that was attached. */ - int error = ptrace_detach(child, data); - if (error) { - pt_error_return(regs, EIO); - goto out_tsk; - } - pt_succ_return(regs, 0); - goto out_tsk; - } - - /* PTRACE_DUMPCORE unsupported... */ - case PTRACE_GETEVENTMSG: { int err; diff --git a/include/asm-sparc/ptrace.h b/include/asm-sparc/ptrace.h index 714497099a4..a84345ba8be 100644 --- a/include/asm-sparc/ptrace.h +++ b/include/asm-sparc/ptrace.h @@ -151,8 +151,6 @@ extern void show_regs(struct pt_regs *); #define SF_XXARG 0x5c /* Stuff for the ptrace system call */ -#define PTRACE_SUNATTACH 10 -#define PTRACE_SUNDETACH 11 #define PTRACE_GETREGS 12 #define PTRACE_SETREGS 13 #define PTRACE_GETFPREGS 14 diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h index 7eba90c6c75..2ba989b3056 100644 --- a/include/asm-sparc64/ptrace.h +++ b/include/asm-sparc64/ptrace.h @@ -261,8 +261,6 @@ extern void show_regs(struct pt_regs *); #define SF_XXARG 0x5c /* Stuff for the ptrace system call */ -#define PTRACE_SUNATTACH 10 -#define PTRACE_SUNDETACH 11 #define PTRACE_GETREGS 12 #define PTRACE_SETREGS 13 #define PTRACE_GETFPREGS 14 |