Commit 7b9de977 authored Aug 08, 2020 by Michael Ellerman Committed by Linus Torvalds Aug 07, 2020

powerpc/ptrace: Fix build error in pkey_get()

The merge resolution in commit 25d8d4ee 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: 25d8d4ee ("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>

parent 30185b69

arch/powerpc/kernel/ptrace/ptrace-view.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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())

Admin message