diff options
author | Ingo Molnar <mingo@elte.hu> | 2007-10-24 12:23:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2007-10-24 12:23:48 -0400 |
commit | b15136e9497ef5d6e08cf665e0d0acf7a229f6dc (patch) | |
tree | 88178f8115d502787e7c52c548c5745350353bc0 | |
parent | 7378547f2c83ca16a30d0a7c488a43a688ea0888 (diff) |
sched: fix fastcall mismatch in completion APIs
Jeff Dike noticed that wait_for_completion_interruptible()'s prototype
had a mismatched fastcall.
Fix this by removing the fastcall attributes from all the completion APIs.
Found-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | include/linux/completion.h | 18 | ||||
-rw-r--r-- | kernel/sched.c | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h index 268c5a4a2bd4..33d6aaf94447 100644 --- a/include/linux/completion.h +++ b/include/linux/completion.h | |||
@@ -42,15 +42,15 @@ static inline void init_completion(struct completion *x) | |||
42 | init_waitqueue_head(&x->wait); | 42 | init_waitqueue_head(&x->wait); |
43 | } | 43 | } |
44 | 44 | ||
45 | extern void FASTCALL(wait_for_completion(struct completion *)); | 45 | extern void wait_for_completion(struct completion *); |
46 | extern int FASTCALL(wait_for_completion_interruptible(struct completion *x)); | 46 | extern int wait_for_completion_interruptible(struct completion *x); |
47 | extern unsigned long FASTCALL(wait_for_completion_timeout(struct completion *x, | 47 | extern unsigned long wait_for_completion_timeout(struct completion *x, |
48 | unsigned long timeout)); | 48 | unsigned long timeout); |
49 | extern unsigned long FASTCALL(wait_for_completion_interruptible_timeout( | 49 | extern unsigned long wait_for_completion_interruptible_timeout( |
50 | struct completion *x, unsigned long timeout)); | 50 | struct completion *x, unsigned long timeout); |
51 | 51 | ||
52 | extern void FASTCALL(complete(struct completion *)); | 52 | extern void complete(struct completion *); |
53 | extern void FASTCALL(complete_all(struct completion *)); | 53 | extern void complete_all(struct completion *); |
54 | 54 | ||
55 | #define INIT_COMPLETION(x) ((x).done = 0) | 55 | #define INIT_COMPLETION(x) ((x).done = 0) |
56 | 56 | ||
diff --git a/kernel/sched.c b/kernel/sched.c index e51f0eabfef2..80edf29fa27c 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -3820,7 +3820,7 @@ __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr_exclusive) | |||
3820 | } | 3820 | } |
3821 | EXPORT_SYMBOL_GPL(__wake_up_sync); /* For internal use only */ | 3821 | EXPORT_SYMBOL_GPL(__wake_up_sync); /* For internal use only */ |
3822 | 3822 | ||
3823 | void fastcall complete(struct completion *x) | 3823 | void complete(struct completion *x) |
3824 | { | 3824 | { |
3825 | unsigned long flags; | 3825 | unsigned long flags; |
3826 | 3826 | ||
@@ -3832,7 +3832,7 @@ void fastcall complete(struct completion *x) | |||
3832 | } | 3832 | } |
3833 | EXPORT_SYMBOL(complete); | 3833 | EXPORT_SYMBOL(complete); |
3834 | 3834 | ||
3835 | void fastcall complete_all(struct completion *x) | 3835 | void complete_all(struct completion *x) |
3836 | { | 3836 | { |
3837 | unsigned long flags; | 3837 | unsigned long flags; |
3838 | 3838 | ||
@@ -3884,13 +3884,13 @@ wait_for_common(struct completion *x, long timeout, int state) | |||
3884 | return timeout; | 3884 | return timeout; |
3885 | } | 3885 | } |
3886 | 3886 | ||
3887 | void fastcall __sched wait_for_completion(struct completion *x) | 3887 | void __sched wait_for_completion(struct completion *x) |
3888 | { | 3888 | { |
3889 | wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE); | 3889 | wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE); |
3890 | } | 3890 | } |
3891 | EXPORT_SYMBOL(wait_for_completion); | 3891 | EXPORT_SYMBOL(wait_for_completion); |
3892 | 3892 | ||
3893 | unsigned long fastcall __sched | 3893 | unsigned long __sched |
3894 | wait_for_completion_timeout(struct completion *x, unsigned long timeout) | 3894 | wait_for_completion_timeout(struct completion *x, unsigned long timeout) |
3895 | { | 3895 | { |
3896 | return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE); | 3896 | return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE); |
@@ -3906,7 +3906,7 @@ int __sched wait_for_completion_interruptible(struct completion *x) | |||
3906 | } | 3906 | } |
3907 | EXPORT_SYMBOL(wait_for_completion_interruptible); | 3907 | EXPORT_SYMBOL(wait_for_completion_interruptible); |
3908 | 3908 | ||
3909 | unsigned long fastcall __sched | 3909 | unsigned long __sched |
3910 | wait_for_completion_interruptible_timeout(struct completion *x, | 3910 | wait_for_completion_interruptible_timeout(struct completion *x, |
3911 | unsigned long timeout) | 3911 | unsigned long timeout) |
3912 | { | 3912 | { |