From 9f8d842d9d2bdbd7a9bbaf46da6a5162656ffe60 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Wed, 27 Oct 2010 15:33:59 -0700 Subject: [PATCH] --- yaml --- r: 218553 b: refs/heads/master c: 1cb4953c608d01d8ea522e2cf379e5e90f06d7a3 h: refs/heads/master i: 218551: 4ff9d4444b70635c39a207081660e05b00c08f5e v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/ptrace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0a65a6fde70e..f687a6727ffe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 261bb92054b9e0835c176a27967dd9eb326d010c +refs/heads/master: 1cb4953c608d01d8ea522e2cf379e5e90f06d7a3 diff --git a/trunk/arch/parisc/kernel/ptrace.c b/trunk/arch/parisc/kernel/ptrace.c index 03920db4af45..2905b1f52d30 100644 --- a/trunk/arch/parisc/kernel/ptrace.c +++ b/trunk/arch/parisc/kernel/ptrace.c @@ -125,7 +125,7 @@ long arch_ptrace(struct task_struct *child, long request, addr >= sizeof(struct pt_regs)) break; tmp = *(unsigned long *) ((char *) task_regs(child) + addr); - ret = put_user(tmp, (unsigned long *) data); + ret = put_user(tmp, (unsigned long __user *) data); break; /* Write the word at location addr in the USER area. This will need