aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/completion.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-25 15:19:03 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-25 15:19:03 -0700
commitfcd05809e1b2f64ece7a0b0bbe94ed29505cd2e0 (patch)
treeb3adedf1e26e2ae36fe8a811462292fbb916451b /include/linux/completion.h
parentf9e83489cbb3670df810d4f9fe308cde88faa0a9 (diff)
parent8ef93cf11413e3f2dc28bfaf736e1f49981ed700 (diff)
downloadkernel_samsung_smdk4412-fcd05809e1b2f64ece7a0b0bbe94ed29505cd2e0.zip
kernel_samsung_smdk4412-fcd05809e1b2f64ece7a0b0bbe94ed29505cd2e0.tar.gz
kernel_samsung_smdk4412-fcd05809e1b2f64ece7a0b0bbe94ed29505cd2e0.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: mark CONFIG_FAIR_GROUP_SCHED as !EXPERIMENTAL sched: isolate SMP balancing code a bit more sched: reduce balance-tasks overhead sched: make cpu_shares_{show,store}() static sched: clean up some control group code sched: constify sched.h sched: document profile=sleep requiring CONFIG_SCHEDSTATS sched: use show_regs() to improve __schedule_bug() output sched: clean up sched_domain_debug() sched: fix fastcall mismatch in completion APIs sched: fix sched_domain sysctl registration again
Diffstat (limited to 'include/linux/completion.h')
-rw-r--r--include/linux/completion.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 268c5a4..33d6aaf 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -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)