Hi all,
After merging the vhost tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/vdpa/vdpa_user/vduse_dev.c: In function 'vduse_vdpa_kick_vq':
drivers/vdpa/vdpa_user/vduse_dev.c:489:6: error: implicit declaration of function 'eventfd_signal_count'; did you mean 'eventfd_signal_allowed'? [-Werror=implicit-function-declaration]
489 | if (eventfd_signal_count()) {
| ^~~~~~~~~~~~~~~~~~~~
| eventfd_signal_allowed
Caused by commit
b66219796563 ("vduse: Introduce VDUSE - vDPA Device in Userspace")
interacting with commit
b542e383d8c0 ("eventfd: Make signal recursion protection a task bit")
from Linus' tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 6 Sep 2021 12:43:32 +1000
Subject: [PATCH] fix up for "eventfd: Make signal recursion protection a task bit"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/vdpa/vdpa_user/vduse_dev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index 59a93e5b967a..5c25ff6483ad 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -486,7 +486,7 @@ static void vduse_vdpa_kick_vq(struct vdpa_device *vdpa, u16 idx)
struct vduse_dev *dev = vdpa_to_vduse(vdpa);
struct vduse_virtqueue *vq = &dev->vqs[idx];
- if (eventfd_signal_count()) {
+ if (eventfd_signal_allowed()) {
schedule_work(&vq->kick);
return;
}
--
2.32.0
--
Cheers,
Stephen Rothwell
Attachment:
pgptR5057pe5q.pgp
Description: OpenPGP digital signature
