Sparc64 fixes:

- Fix some errors in Sparc ptrace debugging output.
- Remove senseless comments above sparc64 copy_thread
referring to sparc32 privileged register issues.

diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index 1d30b5c857f690ce66664914b028a6efa4307289..bff7713516070e89c74358615fc55a425e985b9a 100644 (file)
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -234,29 +234,13 @@ failure:
 
 #ifdef DEBUG_PTRACE
 char *pt_rq [] = {
-"TRACEME",
-"PEEKTEXT",
-"PEEKDATA",
-"PEEKUSR",
-"POKETEXT",
-"POKEDATA",
-"POKEUSR",
-"CONT",
-"KILL",
-"SINGLESTEP",
-"SUNATTACH",
-"SUNDETACH",
-"GETREGS",
-"SETREGS",
-"GETFPREGS",
-"SETFPREGS",
-"READDATA",
-"WRITEDATA",
-"READTEXT",
-"WRITETEXT",
-"GETFPAREGS",
-"SETFPAREGS",
-""
+       /* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
+       /* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
+       /* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
+       /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
+       /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
+       /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
+       /* 24 */ "SYSCALL", ""
 };
 #endif
 
@@ -285,7 +269,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
        {
                char *s;
 
-               if ((request > 0) && (request < 21))
+               if ((request >= 0) && (request <= 24))
                        s = pt_rq [request];
                else
                        s = "unknown";

diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index dbb518664f4220cdcc80bd574f3a8c42a85475ed..f6e0ab087bd8e293ed8d0a9344d3168df0e9577b 100644 (file)
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -586,13 +586,6 @@ barf:
  * under SunOS are nothing short of bletcherous:
  * Parent -->  %o0 == childs  pid, %o1 == 0
  * 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,
                unsigned long unused,

diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index eb925b2793938c45ba1fbe714cece116db30169c..c84a95ee9ee6bdff05342ede0be729b46f0dbfd0 100644 (file)
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -78,29 +78,13 @@ pt_os_succ_return (struct pt_regs *regs, unsigned long val, long *addr)
 
 #ifdef DEBUG_PTRACE
 char *pt_rq [] = {
-"TRACEME",
-"PEEKTEXT",
-"PEEKDATA",
-"PEEKUSR",
-"POKETEXT",
-"POKEDATA",
-"POKEUSR",
-"CONT",
-"KILL",
-"SINGLESTEP",
-"SUNATTACH",
-"SUNDETACH",
-"GETREGS",
-"SETREGS",
-"GETFPREGS",
-"SETFPREGS",
-"READDATA",
-"WRITEDATA",
-"READTEXT",
-"WRITETEXT",
-"GETFPAREGS",
-"SETFPAREGS",
-""
+       /* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
+       /* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
+       /* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
+       /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
+       /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
+       /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
+       /* 24 */ "SYSCALL", ""
 };
 #endif
 
@@ -134,7 +118,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
        {
                char *s;
 
-               if ((request > 0) && (request < 21))
+               if ((request >= 0) && (request <= 24))
                        s = pt_rq [request];
                else
                        s = "unknown";