powerpc/ptrace: Fix build error in pkey_get()
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 7 Aug 2020 23:12:03 +0000 (09:12 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2020 01:27:26 +0000 (18:27 -0700)
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>
arch/powerpc/kernel/ptrace/ptrace-view.c

index 19823a2..7e6478e 100644 (file)
@@ -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())