Skip to content

Commit

Permalink
[SPARC]: Remove PTRACE_SUN* handling.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Feb 7, 2008
1 parent 3828276 commit 190aa9f
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 32 deletions.
15 changes: 1 addition & 14 deletions arch/sparc/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
15 changes: 1 addition & 14 deletions arch/sparc64/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions include/asm-sparc/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions include/asm-sparc64/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 190aa9f

Please sign in to comment.