summaryrefslogtreecommitdiff
path: root/include/linux/swait.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-08-28 12:38:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-08-28 12:38:26 -0700
commitb03a4342142be0c608061a91fa52ec21f6853152 (patch)
treefd6e479d544afb432e1e3260897010e8aefafb59 /include/linux/swait.h
parent5b07aaca1809f459d74589c38b20f87da554027f (diff)
parent46822860a5a9a5a558475d323a55c8aab0b54012 (diff)
downloadlinux-b03a4342142be0c608061a91fa52ec21f6853152.tar.gz
linux-b03a4342142be0c608061a91fa52ec21f6853152.tar.bz2
linux-b03a4342142be0c608061a91fa52ec21f6853152.zip
Merge tag 'seccomp-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp updates from Kees Cook: - Provide USER_NOTIFY flag for synchronous mode (Andrei Vagin, Peter Oskolkov). This touches the scheduler and perf but has been Acked by Peter Zijlstra. - Fix regression in syscall skipping and restart tracing on arm32. This touches arch/arm/ but has been Acked by Arnd Bergmann. * tag 'seccomp-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: seccomp: Add missing kerndoc notations ARM: ptrace: Restore syscall skipping for tracers ARM: ptrace: Restore syscall restart tracing selftests/seccomp: Handle arm32 corner cases better perf/benchmark: add a new benchmark for seccom_unotify selftest/seccomp: add a new test for the sync mode of seccomp_user_notify seccomp: add the synchronous mode for seccomp_unotify sched: add a few helpers to wake up tasks on the current cpu sched: add WF_CURRENT_CPU and externise ttwu seccomp: don't use semaphore and wait_queue together
Diffstat (limited to 'include/linux/swait.h')
-rw-r--r--include/linux/swait.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/swait.h b/include/linux/swait.h
index 6a8c22b8c2a5..d324419482a0 100644
--- a/include/linux/swait.h
+++ b/include/linux/swait.h
@@ -146,7 +146,7 @@ static inline bool swq_has_sleeper(struct swait_queue_head *wq)
extern void swake_up_one(struct swait_queue_head *q);
extern void swake_up_all(struct swait_queue_head *q);
-extern void swake_up_locked(struct swait_queue_head *q);
+extern void swake_up_locked(struct swait_queue_head *q, int wake_flags);
extern void prepare_to_swait_exclusive(struct swait_queue_head *q, struct swait_queue *wait, int state);
extern long prepare_to_swait_event(struct swait_queue_head *q, struct swait_queue *wait, int state);