diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-05 12:21:09 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-05 12:21:09 +0900 |
| commit | 94a46d3cde81fc82eef2105fcb5c9e6e31bac0f7 (patch) | |
| tree | 445ff43779938b539e0799e81c90b85bbee552cd /arch/sparc/kernel/ptrace_32.c | |
| parent | 720fcb36ac1aa2df2c54c170253b6b29600cbefc (diff) | |
| parent | db217dece3003df0841bacf9556b5c06aa097dae (diff) | |
| download | op-kernel-dev-94a46d3cde81fc82eef2105fcb5c9e6e31bac0f7.zip op-kernel-dev-94a46d3cde81fc82eef2105fcb5c9e6e31bac0f7.tar.gz | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sparc/kernel/ptrace_32.c')
| -rw-r--r-- | arch/sparc/kernel/ptrace_32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c index 7e3dfd9..e608f39 100644 --- a/arch/sparc/kernel/ptrace_32.c +++ b/arch/sparc/kernel/ptrace_32.c @@ -65,6 +65,7 @@ static int genregs32_get(struct task_struct *target, *k++ = regs->u_regs[pos++]; reg_window = (unsigned long __user *) regs->u_regs[UREG_I6]; + reg_window -= 16; for (; count > 0 && pos < 32; count--) { if (get_user(*k++, ®_window[pos++])) return -EFAULT; @@ -76,6 +77,7 @@ static int genregs32_get(struct task_struct *target, } reg_window = (unsigned long __user *) regs->u_regs[UREG_I6]; + reg_window -= 16; for (; count > 0 && pos < 32; count--) { if (get_user(reg, ®_window[pos++]) || put_user(reg, u++)) @@ -141,6 +143,7 @@ static int genregs32_set(struct task_struct *target, regs->u_regs[pos++] = *k++; reg_window = (unsigned long __user *) regs->u_regs[UREG_I6]; + reg_window -= 16; for (; count > 0 && pos < 32; count--) { if (put_user(*k++, ®_window[pos++])) return -EFAULT; @@ -153,6 +156,7 @@ static int genregs32_set(struct task_struct *target, } reg_window = (unsigned long __user *) regs->u_regs[UREG_I6]; + reg_window -= 16; for (; count > 0 && pos < 32; count--) { if (get_user(reg, u++) || put_user(reg, ®_window[pos++])) |
