From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>,
Linus Torvalds <torvalds@linux-foundation•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Herbert Xu <herbert@gondor•apana.org.au>
Subject: linux-next: build failure after merge of the random tree
Date: Fri, 29 Jun 2018 16:06:10 +1000 [thread overview]
Message-ID: <20180629160610.5abd17c0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2372 bytes --]
Hi Theodore,
After merging the random tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from include/linux/mmzone.h:10:0,
from include/linux/gfp.h:6,
from include/linux/umh.h:4,
from include/linux/kmod.h:22,
from include/linux/module.h:13,
from drivers/char/random.c:242:
drivers/char/random.c: In function 'random_ioctl':
drivers/char/random.c:1973:32: error: 'random_wait' undeclared (first use in this function); did you mean 'random_write'?
wake_up_interruptible_poll(&random_wait, POLLIN);
^
include/linux/wait.h:216:12: note: in definition of macro 'wake_up_interruptible_poll'
__wake_up(x, TASK_INTERRUPTIBLE, 1, poll_to_key(m))
^
drivers/char/random.c:1973:32: note: each undeclared identifier is reported only once for each function it appears in
wake_up_interruptible_poll(&random_wait, POLLIN);
^
include/linux/wait.h:216:12: note: in definition of macro 'wake_up_interruptible_poll'
__wake_up(x, TASK_INTERRUPTIBLE, 1, poll_to_key(m))
^
Caused by commit
e4f3df9712bb ("random: Wake up writers when random pools are zapped")
interacting with commit
a11e1d432b51 ("Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL")
from Linus' tree.
I took a stab and applied the following patch:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 29 Jun 2018 15:43:01 +1000
Subject: [PATCH] random: fix up for revert of poll_mask changes
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/char/random.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 00db7aed3204..d686aa2a129b 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1970,7 +1970,7 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
input_pool.entropy_count = 0;
blocking_pool.entropy_count = 0;
if (random_write_wakeup_bits) {
- wake_up_interruptible_poll(&random_wait, POLLIN);
+ wake_up_interruptible_poll(&random_write_wait, POLLIN);
kill_fasync(&fasync, SIGIO, POLL_OUT);
}
return 0;
--
2.17.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-06-29 6:06 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-29 6:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-03 8:04 linux-next: build failure after merge of the random tree Stephen Rothwell
2022-03-03 10:41 ` Jason A. Donenfeld
2022-10-24 2:23 Stephen Rothwell
2022-10-24 4:28 ` Jason A. Donenfeld
2022-10-24 6:33 ` Stephen Rothwell
2022-10-31 6:09 Stephen Rothwell
2022-10-31 10:31 ` Jason A. Donenfeld
2022-12-13 3:36 Stephen Rothwell
2022-12-13 4:02 ` Jason A. Donenfeld
2022-12-14 1:53 Stephen Rothwell
2022-12-14 5:37 ` Jason A. Donenfeld
2024-03-25 1:01 Stephen Rothwell
2024-03-26 16:08 ` Jason A. Donenfeld
2024-09-05 10:19 Stephen Rothwell
2024-09-05 12:47 ` Jason A. Donenfeld
2024-10-01 3:44 Stephen Rothwell
2024-10-01 8:06 ` Uros Bizjak
2024-10-10 4:38 ` Stephen Rothwell
2024-11-20 2:34 ` Stephen Rothwell
2026-01-23 21:48 Mark Brown
2026-01-23 21:56 ` Andy Shevchenko
2026-01-23 22:10 ` Mark Brown
2026-01-23 22:18 ` Andy Shevchenko
2026-01-23 22:22 ` Mark Brown
2026-01-23 22:44 ` Andy Shevchenko
2026-02-02 15:22 ` Mark Brown
2026-02-02 17:34 ` Andy Shevchenko
2026-02-02 19:51 ` Jason A. Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180629160610.5abd17c0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox