summaryrefslogtreecommitdiff
path: root/include/linux/completion.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2022-10-17 12:36:32 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2022-10-17 12:36:32 +0300
commitc29a017f9df34d190fbc7917d30dbefce7d9dc1f (patch)
tree98919b99c7aba0404c4fdbbf953dc72084509c06 /include/linux/completion.h
parentd4a596eddb90114f5f5f32a440057a175517b090 (diff)
parent9abf2313adc1ca1b6180c508c25f22f9395cc780 (diff)
downloadlinux-c29a017f9df34d190fbc7917d30dbefce7d9dc1f.tar.xz
Merge tag 'v6.1-rc1' into next
Merge with mainline to bring in the latest changes to twl4030 driver.
Diffstat (limited to 'include/linux/completion.h')
-rw-r--r--include/linux/completion.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 51d9ab079629..62b32b19e0a8 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -103,6 +103,7 @@ extern void wait_for_completion(struct completion *);
extern void wait_for_completion_io(struct completion *);
extern int wait_for_completion_interruptible(struct completion *x);
extern int wait_for_completion_killable(struct completion *x);
+extern int wait_for_completion_state(struct completion *x, unsigned int state);
extern unsigned long wait_for_completion_timeout(struct completion *x,
unsigned long timeout);
extern unsigned long wait_for_completion_io_timeout(struct completion *x,