summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0310-eventfd-Make-signal-recursion-protection-a-task-bit.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0310-eventfd-Make-signal-recursion-protection-a-task-bit.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches-rt/0310-eventfd-Make-signal-recursion-protection-a-task-bit.patch b/debian/patches-rt/0310-eventfd-Make-signal-recursion-protection-a-task-bit.patch
index 719316f76..b83fec72f 100644
--- a/debian/patches-rt/0310-eventfd-Make-signal-recursion-protection-a-task-bit.patch
+++ b/debian/patches-rt/0310-eventfd-Make-signal-recursion-protection-a-task-bit.patch
@@ -1,8 +1,8 @@
-From 17c41196e72418f94cf308a8b23fe478612a1610 Mon Sep 17 00:00:00 2001
+From 563a8863b188e15be8027634bc3788c810e6ee74 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 17 Dec 2021 11:32:09 +0100
Subject: [PATCH 310/323] eventfd: Make signal recursion protection a task bit
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
Upstream commit b542e383d8c005f06a131e2b40d5889b812f19c6
@@ -40,10 +40,10 @@ Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
-index c90e045a37bc..e1181dc37be1 100644
+index 43315af1c83ac..7030157e99338 100644
--- a/fs/aio.c
+++ b/fs/aio.c
-@@ -1765,7 +1765,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
+@@ -1776,7 +1776,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
list_del_init(&req->wait.entry);
list_del(&iocb->ki_list);
iocb->ki_res.res = mangle_poll(mask);
@@ -53,7 +53,7 @@ index c90e045a37bc..e1181dc37be1 100644
INIT_WORK(&req->work, aio_poll_put_work);
schedule_work(&req->work);
diff --git a/fs/eventfd.c b/fs/eventfd.c
-index 3673eb8de035..ce9ca07d6c00 100644
+index 3673eb8de0356..ce9ca07d6c004 100644
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -25,8 +25,6 @@
@@ -93,7 +93,7 @@ index 3673eb8de035..ce9ca07d6c00 100644
return n;
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
-index c1bd4883e2fa..842d223dfe17 100644
+index c1bd4883e2faf..842d223dfe175 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -14,6 +14,7 @@
@@ -131,7 +131,7 @@ index c1bd4883e2fa..842d223dfe17 100644
static inline void eventfd_ctx_do_read(struct eventfd_ctx *ctx, __u64 *cnt)
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index a73528e8235d..13d4957189bb 100644
+index a73528e8235d4..13d4957189bb9 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -848,6 +848,10 @@ struct task_struct {
@@ -146,5 +146,5 @@ index a73528e8235d..13d4957189bb 100644
unsigned long atomic_flags; /* Flags requiring atomic access. */
--
-2.43.0
+2.44.0