diff --git a/linux-tkg-patches/5.15/0007-v5.15-fsync.patch b/linux-tkg-patches/5.15/0007-v5.15-fsync.patch index c2ef271..8a8650d 100644 --- a/linux-tkg-patches/5.15/0007-v5.15-fsync.patch +++ b/linux-tkg-patches/5.15/0007-v5.15-fsync.patch @@ -68,7 +68,7 @@ Signed-off-by: André Almeida Adjusted for v5.9: Removed `put_futex_key` calls. --- include/uapi/linux/futex.h | 20 +++ - kernel/futex.c | 348 +++++++++++++++++++++++++++++++++++++ + kernel/futex/core.c | 348 +++++++++++++++++++++++++++++++++++++ 2 files changed, 368 insertions(+) diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h @@ -114,10 +114,10 @@ index a89eb0accd5e2e..580001e89c6cae 100644 +}; + #endif /* _UAPI_LINUX_FUTEX_H */ -diff --git a/kernel/futex.c b/kernel/futex.c +diff --git a/kernel/futex/core.c b/kernel/futex/core.c index 408cad5e89680f..c30930a955cece 100644 ---- a/kernel/futex.c -+++ b/kernel/futex.c +--- a/kernel/futex/core.c ++++ b/kernel/futex/core.c @@ -197,6 +197,8 @@ struct futex_pi_state { * @bitset: bitset for the optional bitmasked wakeup * @requeue_state: State field for futex_requeue_pi() @@ -536,7 +536,7 @@ Subject: [PATCH] futex: Add Proton compatibility code --- include/uapi/linux/futex.h | 2 +- - kernel/futex.c | 3 ++- + kernel/futex/core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h @@ -552,10 +552,10 @@ index 580001e89c6cae..a3e760886b8e7e 100644 #define FUTEX_PRIVATE_FLAG 128 #define FUTEX_CLOCK_REALTIME 256 -diff --git a/kernel/futex.c b/kernel/futex.c +diff --git a/kernel/futex/core.c b/kernel/futex/core.c index c30930a955cece..aa33e66df5c9df 100644 ---- a/kernel/futex.c -+++ b/kernel/futex.c +--- a/kernel/futex/core.c ++++ b/kernel/futex/core.c @@ -4002,7 +4002,7 @@ futex_init_timeout(u32 cmd, u32 op, struct timespec64 *ts, ktime_t *t) return -EINVAL;