Skip to content

Commit

Permalink
sched: fix fastcall mismatch in completion APIs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ingo Molnar committed Oct 24, 2007
1 parent 7378547 commit b15136e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
18 changes: 9 additions & 9 deletions include/linux/completion.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ static inline void init_completion(struct completion *x)
init_waitqueue_head(&x->wait);
}

extern void FASTCALL(wait_for_completion(struct completion *));
extern int FASTCALL(wait_for_completion_interruptible(struct completion *x));
extern unsigned long FASTCALL(wait_for_completion_timeout(struct completion *x,
unsigned long timeout));
extern unsigned long FASTCALL(wait_for_completion_interruptible_timeout(
struct completion *x, unsigned long timeout));

extern void FASTCALL(complete(struct completion *));
extern void FASTCALL(complete_all(struct completion *));
extern void wait_for_completion(struct completion *);
extern int wait_for_completion_interruptible(struct completion *x);
extern unsigned long wait_for_completion_timeout(struct completion *x,
unsigned long timeout);
extern unsigned long wait_for_completion_interruptible_timeout(
struct completion *x, unsigned long timeout);

extern void complete(struct completion *);
extern void complete_all(struct completion *);

#define INIT_COMPLETION(x) ((x).done = 0)

Expand Down
10 changes: 5 additions & 5 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -3820,7 +3820,7 @@ __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr_exclusive)
}
EXPORT_SYMBOL_GPL(__wake_up_sync); /* For internal use only */

void fastcall complete(struct completion *x)
void complete(struct completion *x)
{
unsigned long flags;

Expand All @@ -3832,7 +3832,7 @@ void fastcall complete(struct completion *x)
}
EXPORT_SYMBOL(complete);

void fastcall complete_all(struct completion *x)
void complete_all(struct completion *x)
{
unsigned long flags;

Expand Down Expand Up @@ -3884,13 +3884,13 @@ wait_for_common(struct completion *x, long timeout, int state)
return timeout;
}

void fastcall __sched wait_for_completion(struct completion *x)
void __sched wait_for_completion(struct completion *x)
{
wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE);
}
EXPORT_SYMBOL(wait_for_completion);

unsigned long fastcall __sched
unsigned long __sched
wait_for_completion_timeout(struct completion *x, unsigned long timeout)
{
return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE);
Expand All @@ -3906,7 +3906,7 @@ int __sched wait_for_completion_interruptible(struct completion *x)
}
EXPORT_SYMBOL(wait_for_completion_interruptible);

unsigned long fastcall __sched
unsigned long __sched
wait_for_completion_interruptible_timeout(struct completion *x,
unsigned long timeout)
{
Expand Down

0 comments on commit b15136e

Please sign in to comment.