diff options
-rw-r--r-- | include/linux/completion.h | 8 | ||||
-rw-r--r-- | kernel/sched.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h index 36d57f74cd0..51494e6b554 100644 --- a/include/linux/completion.h +++ b/include/linux/completion.h | |||
@@ -81,10 +81,10 @@ extern int wait_for_completion_interruptible(struct completion *x); | |||
81 | extern int wait_for_completion_killable(struct completion *x); | 81 | extern int wait_for_completion_killable(struct completion *x); |
82 | extern unsigned long wait_for_completion_timeout(struct completion *x, | 82 | extern unsigned long wait_for_completion_timeout(struct completion *x, |
83 | unsigned long timeout); | 83 | unsigned long timeout); |
84 | extern unsigned long wait_for_completion_interruptible_timeout( | 84 | extern long wait_for_completion_interruptible_timeout( |
85 | struct completion *x, unsigned long timeout); | 85 | struct completion *x, unsigned long timeout); |
86 | extern unsigned long wait_for_completion_killable_timeout( | 86 | extern long wait_for_completion_killable_timeout( |
87 | struct completion *x, unsigned long timeout); | 87 | struct completion *x, unsigned long timeout); |
88 | extern bool try_wait_for_completion(struct completion *x); | 88 | extern bool try_wait_for_completion(struct completion *x); |
89 | extern bool completion_done(struct completion *x); | 89 | extern bool completion_done(struct completion *x); |
90 | 90 | ||
diff --git a/kernel/sched.c b/kernel/sched.c index f2f914e0c47..114a0deb2b0 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4395,7 +4395,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible); | |||
4395 | * This waits for either a completion of a specific task to be signaled or for a | 4395 | * This waits for either a completion of a specific task to be signaled or for a |
4396 | * specified timeout to expire. It is interruptible. The timeout is in jiffies. | 4396 | * specified timeout to expire. It is interruptible. The timeout is in jiffies. |
4397 | */ | 4397 | */ |
4398 | unsigned long __sched | 4398 | long __sched |
4399 | wait_for_completion_interruptible_timeout(struct completion *x, | 4399 | wait_for_completion_interruptible_timeout(struct completion *x, |
4400 | unsigned long timeout) | 4400 | unsigned long timeout) |
4401 | { | 4401 | { |
@@ -4428,7 +4428,7 @@ EXPORT_SYMBOL(wait_for_completion_killable); | |||
4428 | * signaled or for a specified timeout to expire. It can be | 4428 | * signaled or for a specified timeout to expire. It can be |
4429 | * interrupted by a kill signal. The timeout is in jiffies. | 4429 | * interrupted by a kill signal. The timeout is in jiffies. |
4430 | */ | 4430 | */ |
4431 | unsigned long __sched | 4431 | long __sched |
4432 | wait_for_completion_killable_timeout(struct completion *x, | 4432 | wait_for_completion_killable_timeout(struct completion *x, |
4433 | unsigned long timeout) | 4433 | unsigned long timeout) |
4434 | { | 4434 | { |