linux-next: build failure after merge of the akpm-current tree

Stephen Rothwell
2018-08-13T08:22:18Z

[-- Attachment #1: Type: text/plain, Size: 1719 bytes --]

Hi all,

After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

kernel/exit.c: In function 'reparent_leader':
kernel/exit.c:640:3: error: too few arguments to function 'group_send_sig_info'
group_send_sig_info(p->signal->pdeath_signal_proc,
^~~~~~~~~~~~~~~~~~~
In file included from include/linux/sched/signal.h:6:0,
from include/linux/sched/cputime.h:5,
from kernel/exit.c:14:
include/linux/signal.h:262:12: note: declared here
extern int group_send_sig_info(int sig, struct siginfo *info,
^~~~~~~~~~~~~~~~~~~

Caused by commit

b04bd4d0117c ("prctl: add PR_[GS]ET_PDEATHSIG_PROC")

interacting with commit

0102498083d5 ("signal: Pass pid type into group_send_sig_info")

from the uerns tree.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 13 Aug 2018 18:07:07 +1000
Subject: [PATCH] merge fix up for "signal: Pass pid type into
group_send_sig_info"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
kernel/exit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/exit.c b/kernel/exit.c
index 7b72bed283d4..066c66448258 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -638,7 +638,7 @@ static void reparent_leader(struct task_struct *father, struct task_struct *p,

if (p->signal->pdeath_signal_proc)
group_send_sig_info(p->signal->pdeath_signal_proc,
- SEND_SIG_NOINFO, p);
+ SEND_SIG_NOINFO, p, PIDTYPE_TGID);

/* We don't want people slaying init. */
p->exit_signal = SIGCHLD;
--
2.18.0

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]