3 files changed, 5 insertions, 13 deletions

diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c
index 8a0db376e91e..26ec774c5027 100644
--- a/arch/parisc/kernel/ptrace.c
+++ b/arch/parisc/kernel/ptrace.c
@@ -87,10 +87,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         switch (request) {
         case PTRACE_PEEKTEXT: /* read word at location addr. */ 
         case PTRACE_PEEKDATA: {
-                int copied;
-
 #ifdef CONFIG_64BIT
                 if (__is_compat_task(child)) {
+                        int copied;
                         unsigned int tmp;
 
                         addr &= 0xffffffffL;
@@ -105,15 +104,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 }
                 else
 #endif
-                {
-                        unsigned long tmp;
-
-                        copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                        ret = -EIO;
-                        if (copied != sizeof(tmp))
-                                goto out_tsk;
-                        ret = put_user(tmp,(unsigned long *) data);
-                }
+                        ret = generic_ptrace_peekdata(child, addr, data);
                 goto out_tsk;
         }
 
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index c3ec9f1ec0f3..bbf029a184ac 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -264,6 +264,7 @@ KERN_CRIT "                     ||     ||\n");
 
         show_regs(regs);
         dump_stack();
+        add_taint(TAINT_DIE);
 
         if (in_interrupt())
                 panic("Fatal exception in interrupt");
@@ -302,7 +303,7 @@ static void handle_break(struct pt_regs *regs)
         if (unlikely(iir == PARISC_BUG_BREAK_INSN && !user_mode(regs))) {
                 /* check if a BUG() or WARN() trapped here.  */
                 enum bug_trap_type tt;
-                tt = report_bug(regs->iaoq[0] & ~3);
+                tt = report_bug(regs->iaoq[0] & ~3, regs);
                 if (tt == BUG_TRAP_TYPE_WARN) {
                         regs->iaoq[0] += 4;
                         regs->iaoq[1] += 4;
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 322167737de7..cf780cb3b916 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -242,7 +242,7 @@ static void unwind_frame_regs(struct unwind_frame_info *info)
 #ifdef CONFIG_KALLSYMS
                 /* Handle some frequent special cases.... */
                 {
-                        char symname[KSYM_NAME_LEN+1];
+                        char symname[KSYM_NAME_LEN];
                         char *modname;
 
                         kallsyms_lookup(info->ip, NULL, NULL, &modname,