diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-07 16:40:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-07 16:40:14 -0700 |
| commit | 9049a40c858f49c141e12924b77b91cce4c46617 (patch) | |
| tree | 78d3a5486c92c70b48208b8ae8a00fedbea7468d /arch/sparc | |
| parent | 824c874abc1d99121934364647dd8ed7e71ce08e (diff) | |
| parent | 9d964e1b82d8182184153b70174f445ea616f053 (diff) | |
| download | linux-9049a40c858f49c141e12924b77b91cce4c46617.tar.gz linux-9049a40c858f49c141e12924b77b91cce4c46617.tar.bz2 linux-9049a40c858f49c141e12924b77b91cce4c46617.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/ptrace_32.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c index 60f7205ebe40..646dd58169ec 100644 --- a/arch/sparc/kernel/ptrace_32.c +++ b/arch/sparc/kernel/ptrace_32.c @@ -168,12 +168,17 @@ static int genregs32_set(struct task_struct *target, if (ret || !count) return ret; ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, - ®s->y, + ®s->npc, 34 * sizeof(u32), 35 * sizeof(u32)); if (ret || !count) return ret; + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, + ®s->y, + 35 * sizeof(u32), 36 * sizeof(u32)); + if (ret || !count) + return ret; return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf, - 35 * sizeof(u32), 38 * sizeof(u32)); + 36 * sizeof(u32), 38 * sizeof(u32)); } static int fpregs32_get(struct task_struct *target, |