diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-05-13 23:52:56 -0400 |
---|---|---|
committer | Paul Mundt <lethal@hera.kernel.org> | 2007-06-07 22:43:36 -0400 |
commit | e08f457c7c0cc7720f28349f8780ea752c063441 (patch) | |
tree | 7b82666f2002d57dc57d022daf90c778265159e9 /arch/sh/kernel/ptrace.c | |
parent | 7a302a9674593259866de4a9d5ae8edc03dc1934 (diff) |
sh: __user annotations for __get/__put_user().
This adds in some more __user annotations. These weren't being
handled properly in some of the __get_user and __put_user paths,
so tidy those up.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/ptrace.c')
-rw-r--r-- | arch/sh/kernel/ptrace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c index 3fb5fc0b550d..f2eaa485d04d 100644 --- a/arch/sh/kernel/ptrace.c +++ b/arch/sh/kernel/ptrace.c | |||
@@ -99,7 +99,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
99 | ret = -EIO; | 99 | ret = -EIO; |
100 | if (copied != sizeof(tmp)) | 100 | if (copied != sizeof(tmp)) |
101 | break; | 101 | break; |
102 | ret = put_user(tmp,(unsigned long *) data); | 102 | ret = put_user(tmp,(unsigned long __user *) data); |
103 | break; | 103 | break; |
104 | } | 104 | } |
105 | 105 | ||
@@ -128,7 +128,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
128 | tmp = !!tsk_used_math(child); | 128 | tmp = !!tsk_used_math(child); |
129 | else | 129 | else |
130 | tmp = 0; | 130 | tmp = 0; |
131 | ret = put_user(tmp, (unsigned long *)data); | 131 | ret = put_user(tmp, (unsigned long __user *)data); |
132 | break; | 132 | break; |
133 | } | 133 | } |
134 | 134 | ||
@@ -196,7 +196,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
196 | 196 | ||
197 | case PTRACE_SINGLESTEP: { /* set the trap flag. */ | 197 | case PTRACE_SINGLESTEP: { /* set the trap flag. */ |
198 | long pc; | 198 | long pc; |
199 | struct pt_regs *dummy = NULL; | 199 | struct pt_regs *regs = NULL; |
200 | 200 | ||
201 | ret = -EIO; | 201 | ret = -EIO; |
202 | if (!valid_signal(data)) | 202 | if (!valid_signal(data)) |
@@ -207,7 +207,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
207 | child->ptrace |= PT_DTRACE; | 207 | child->ptrace |= PT_DTRACE; |
208 | } | 208 | } |
209 | 209 | ||
210 | pc = get_stack_long(child, (long)&dummy->pc); | 210 | pc = get_stack_long(child, (long)®s->pc); |
211 | 211 | ||
212 | /* Next scheduling will set up UBC */ | 212 | /* Next scheduling will set up UBC */ |
213 | if (child->thread.ubc_pc == 0) | 213 | if (child->thread.ubc_pc == 0) |