Skip to content

Commit

Permalink
powerpc/ptrace: Fix build error in pkey_get()
Browse files Browse the repository at this point in the history
The merge resolution in commit 25d8d4e 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: 25d8d4e ("Merge tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux")
Signed-off-by: Michael Ellerman <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
mpe authored and torvalds committed Aug 8, 2020
1 parent 30185b6 commit 7b9de97
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/powerpc/kernel/ptrace/ptrace-view.c
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 7b9de97

Please sign in to comment.