linux-next: build failure after merge of the mm tree

[Stephen Rothwell]

Hi all,

After merging the mm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/kernel/ptrace/ptrace-view.c: In function 'gpr32_set_common':
arch/powerpc/kernel/ptrace/ptrace-view.c:709:16: error: void value not ignored as it ought to be
  709 |         return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
      |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  710 |                                          (PT_TRAP + 1) * sizeof(reg), -1);
      |                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  1afca3ae915b ("regset: make user_regset_copyin_ignore() *void*")

after commit

  8541413ac862 ("powerpc: ptrace: user_regset_copyin_ignore() always returns 0")

missed one call site.

I have applied the following patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 18 Oct 2022 12:19:20 +1100
Subject: [PATCH] fix up for "powerpc: ptrace: user_regset_copyin_ignore() always returns 0"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/powerpc/kernel/ptrace/ptrace-view.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/ptrace/ptrace-view.c b/arch/powerpc/kernel/ptrace/ptrace-view.c
index ca0bf8da48fd..2087a785f05f 100644
--- a/arch/powerpc/kernel/ptrace/ptrace-view.c
+++ b/arch/powerpc/kernel/ptrace/ptrace-view.c
@@ -706,8 +706,9 @@ int gpr32_set_common(struct task_struct *target,
 	ubuf = u;
 	pos *= sizeof(reg);
 	count *= sizeof(reg);
-	return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-					 (PT_TRAP + 1) * sizeof(reg), -1);
+	user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+				  (PT_TRAP + 1) * sizeof(reg), -1);
+	return 0;
 
 Efault:
 	user_read_access_end();
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpc_PEa2U3KE.pgp
Description: OpenPGP digital signature