diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-08-08 09:12:03 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-07 18:27:26 -0700 |
| commit | 7b9de97711225559af213dc52b6ea883ef1ea7a8 (patch) | |
| tree | 2b7bb8224e7d936d1c35f2398003d303c1679176 /arch/powerpc/kernel/ptrace/ptrace-view.c | |
| parent | 30185b69a2d533c4ba6ca926b8390ce7de495e29 (diff) | |
| download | linux-7b9de97711225559af213dc52b6ea883ef1ea7a8.tar.bz2 | |
powerpc/ptrace: Fix build error in pkey_get()
The merge resolution in commit 25d8d4eecace left ret no longer used,
leading to:
arch/powerpc/kernel/ptrace/ptrace-view.c: In function ‘pkey_get’:
arch/powerpc/kernel/ptrace/ptrace-view.c:473:6: error: unused variable ‘ret’
473 | int ret;
Fix it by removing ret.
Fixes: 25d8d4eecace ("Merge tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/kernel/ptrace/ptrace-view.c')
| -rw-r--r-- | arch/powerpc/kernel/ptrace/ptrace-view.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/ptrace/ptrace-view.c b/arch/powerpc/kernel/ptrace/ptrace-view.c index 19823a250aa0..7e6478e7ed07 100644 --- a/arch/powerpc/kernel/ptrace/ptrace-view.c +++ b/arch/powerpc/kernel/ptrace/ptrace-view.c @@ -470,8 +470,6 @@ static int pkey_active(struct task_struct *target, const struct user_regset *reg static int pkey_get(struct task_struct *target, const struct user_regset *regset, struct membuf to) { - int ret; - BUILD_BUG_ON(TSO(amr) + sizeof(unsigned long) != TSO(iamr)); if (!arch_pkeys_enabled()) |