Commit f2f4f4f3 authored by David S. Miller's avatar David S. Miller

Sparc64 fixes:

- Fix some errors in Sparc ptrace debugging output.
- Remove senseless comments above sparc64 copy_thread
referring to sparc32 privileged register issues.
parent a671cb6b
...@@ -234,29 +234,13 @@ static inline void write_sunos_user(struct pt_regs *regs, unsigned long offset, ...@@ -234,29 +234,13 @@ static inline void write_sunos_user(struct pt_regs *regs, unsigned long offset,
#ifdef DEBUG_PTRACE #ifdef DEBUG_PTRACE
char *pt_rq [] = { char *pt_rq [] = {
"TRACEME", /* 0 */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
"PEEKTEXT", /* 4 */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
"PEEKDATA", /* 8 */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
"PEEKUSR", /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
"POKETEXT", /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
"POKEDATA", /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
"POKEUSR", /* 24 */ "SYSCALL", ""
"CONT",
"KILL",
"SINGLESTEP",
"SUNATTACH",
"SUNDETACH",
"GETREGS",
"SETREGS",
"GETFPREGS",
"SETFPREGS",
"READDATA",
"WRITEDATA",
"READTEXT",
"WRITETEXT",
"GETFPAREGS",
"SETFPAREGS",
""
}; };
#endif #endif
...@@ -285,7 +269,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs) ...@@ -285,7 +269,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
{ {
char *s; char *s;
if ((request > 0) && (request < 21)) if ((request >= 0) && (request <= 24))
s = pt_rq [request]; s = pt_rq [request];
else else
s = "unknown"; s = "unknown";
......
...@@ -586,13 +586,6 @@ void fault_in_user_windows(void) ...@@ -586,13 +586,6 @@ void fault_in_user_windows(void)
* under SunOS are nothing short of bletcherous: * under SunOS are nothing short of bletcherous:
* Parent --> %o0 == childs pid, %o1 == 0 * Parent --> %o0 == childs pid, %o1 == 0
* Child --> %o0 == parents pid, %o1 == 1 * Child --> %o0 == parents pid, %o1 == 1
*
* NOTE: We have a separate fork kpsr/kwim because
* the parent could change these values between
* sys_fork invocation and when we reach here
* if the parent should sleep while trying to
* allocate the task_struct and kernel stack in
* do_fork().
*/ */
int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
unsigned long unused, unsigned long unused,
......
...@@ -78,29 +78,13 @@ pt_os_succ_return (struct pt_regs *regs, unsigned long val, long *addr) ...@@ -78,29 +78,13 @@ pt_os_succ_return (struct pt_regs *regs, unsigned long val, long *addr)
#ifdef DEBUG_PTRACE #ifdef DEBUG_PTRACE
char *pt_rq [] = { char *pt_rq [] = {
"TRACEME", /* 0 */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
"PEEKTEXT", /* 4 */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
"PEEKDATA", /* 8 */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
"PEEKUSR", /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
"POKETEXT", /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
"POKEDATA", /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
"POKEUSR", /* 24 */ "SYSCALL", ""
"CONT",
"KILL",
"SINGLESTEP",
"SUNATTACH",
"SUNDETACH",
"GETREGS",
"SETREGS",
"GETFPREGS",
"SETFPREGS",
"READDATA",
"WRITEDATA",
"READTEXT",
"WRITETEXT",
"GETFPAREGS",
"SETFPAREGS",
""
}; };
#endif #endif
...@@ -134,7 +118,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs) ...@@ -134,7 +118,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
{ {
char *s; char *s;
if ((request > 0) && (request < 21)) if ((request >= 0) && (request <= 24))
s = pt_rq [request]; s = pt_rq [request];
else else
s = "unknown"; s = "unknown";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment