diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2026-02-19 22:08:53 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2026-02-19 22:08:53 +0300 |
| commit | b0a67f310bfa5e13d66c9f6b4bd88ea504a576a9 (patch) | |
| tree | f203082c07e790f8d4214075b8c81ace9717bd40 /include/linux/wait.h | |
| parent | 4c51f90d45dca71e7974ed5a7c40b9c04a6c6762 (diff) | |
| parent | 8bf22c33e7a172fbc72464f4cc484d23a6b412ba (diff) | |
| download | linux-b0a67f310bfa5e13d66c9f6b4bd88ea504a576a9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf before 7.0-rc1
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/wait.h')
| -rw-r--r-- | include/linux/wait.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index f648044466d5..dce055e6add3 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -937,6 +937,21 @@ extern int do_wait_intr_irq(wait_queue_head_t *, wait_queue_entry_t *); __ret; \ }) +#define __io_wait_event_killable(wq, condition) \ + ___wait_event(wq, condition, TASK_KILLABLE, 0, 0, io_schedule()) + +/* + * wait_event_killable() - link wait_event_killable but with io_schedule() + */ +#define io_wait_event_killable(wq_head, condition) \ +({ \ + int __ret = 0; \ + might_sleep(); \ + if (!(condition)) \ + __ret = __io_wait_event_killable(wq_head, condition); \ + __ret; \ +}) + #define __wait_event_state(wq, condition, state) \ ___wait_event(wq, condition, state, 0, 0, schedule()) |