From: Michael Ellerman Date: Fri, 7 Aug 2020 23:12:03 +0000 (+1000) Subject: powerpc/ptrace: Fix build error in pkey_get() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7b9de97711225559af213dc52b6ea883ef1ea7a8;p=linux.git 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 Signed-off-by: Linus Torvalds --- diff --git a/arch/powerpc/kernel/ptrace/ptrace-view.c b/arch/powerpc/kernel/ptrace/ptrace-view.c index 19823a250aa02..7e6478e7ed074 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())