---

yaml --- r: 218553 b: refs/heads/master c: 1cb4953 h: refs/heads/master i: 218551: 4ff9d44 v: v3
git-mirror · Oct 28, 2010 · 9f8d842 · 9f8d842
1 parent 7d7fa39
commit 9f8d842
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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