refresh queue-6.0/eventfd-guard-wake_up-in-eventfd-fs-calls-as-well.patch

diff --git a/queue-6.0/eventfd-guard-wake_up-in-eventfd-fs-calls-as-well.patch b/queue-6.0/eventfd-guard-wake_up-in-eventfd-fs-calls-as-well.patch
index 9d42015322036deb8cd2bbe7c014e29e0b2a6245..4896a72ba58198cf4230c41a1ec0d96910acef65 100644 (file)
--- a/queue-6.0/eventfd-guard-wake_up-in-eventfd-fs-calls-as-well.patch
+++ b/queue-6.0/eventfd-guard-wake_up-in-eventfd-fs-calls-as-well.patch
@@ -35,19 +35,17 @@ Signed-off-by: Dylan Yudaken <dylany@fb.com>
 Reviewed-by: Jens Axboe <axboe@kernel.dk>
 Link: https://lore.kernel.org/r/20220816135959.1490641-1-dylany@fb.com
 Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Stable-dep-of: 3b8fdd1dc35e ("io_uring/fdinfo: fix sqe dumping for IORING_SETUP_SQE128")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- fs/eventfd.c            | 10 +++++++---
- include/linux/eventfd.h |  2 +-
- include/linux/sched.h   |  2 +-
+ fs/eventfd.c            |   10 +++++++---
+ include/linux/eventfd.h |    2 +-
+ include/linux/sched.h   |    2 +-
  3 files changed, 9 insertions(+), 5 deletions(-)
 
-diff --git a/fs/eventfd.c b/fs/eventfd.c
-index 3627dd7d25db..c0ffee99ad23 100644
 --- a/fs/eventfd.c
 +++ b/fs/eventfd.c
-@@ -69,17 +69,17 @@ __u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n)
+@@ -69,17 +69,17 @@ __u64 eventfd_signal(struct eventfd_ctx
         * it returns false, the eventfd_signal() call should be deferred to a
         * safe context.
         */
@@ -68,7 +66,7 @@ index 3627dd7d25db..c0ffee99ad23 100644
        spin_unlock_irqrestore(&ctx->wqh.lock, flags);
  
        return n;
-@@ -253,8 +253,10 @@ static ssize_t eventfd_read(struct kiocb *iocb, struct iov_iter *to)
+@@ -253,8 +253,10 @@ static ssize_t eventfd_read(struct kiocb
                __set_current_state(TASK_RUNNING);
        }
        eventfd_ctx_do_read(ctx, &ucnt);
@@ -79,7 +77,7 @@ index 3627dd7d25db..c0ffee99ad23 100644
        spin_unlock_irq(&ctx->wqh.lock);
        if (unlikely(copy_to_iter(&ucnt, sizeof(ucnt), to) != sizeof(ucnt)))
                return -EFAULT;
-@@ -301,8 +303,10 @@ static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t c
+@@ -301,8 +303,10 @@ static ssize_t eventfd_write(struct file
        }
        if (likely(res > 0)) {
                ctx->count += ucnt;
@@ -90,11 +88,9 @@ index 3627dd7d25db..c0ffee99ad23 100644
        }
        spin_unlock_irq(&ctx->wqh.lock);
  
-diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
-index 305d5f19093b..30eb30d6909b 100644
 --- a/include/linux/eventfd.h
 +++ b/include/linux/eventfd.h
-@@ -46,7 +46,7 @@ void eventfd_ctx_do_read(struct eventfd_ctx *ctx, __u64 *cnt);
+@@ -46,7 +46,7 @@ void eventfd_ctx_do_read(struct eventfd_
  
  static inline bool eventfd_signal_allowed(void)
  {
@@ -103,8 +99,6 @@ index 305d5f19093b..30eb30d6909b 100644
  }
  
  #else /* CONFIG_EVENTFD */
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index e7b2f8a5c711..8d82d6d32670 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -936,7 +936,7 @@ struct task_struct {
@@ -116,6 +110,3 @@ index e7b2f8a5c711..8d82d6d32670 100644
  #endif
  #ifdef CONFIG_IOMMU_SVA
        unsigned                        pasid_activated:1;
--- 
-2.35.1
-