summaryrefslogtreecommitdiffstats
path: root/include/linux/completion.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-07-03 00:24:28 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 15:27:00 -0700
commit8b3db9c542e18b71d4820da4dd9401ee030feacb (patch)
tree93e093fcb0a01b3ee06329e57d92d73d66207edd /include/linux/completion.h
parentd7e9629de051bb4b1d104588cd97673ad770809e (diff)
downloadlinux-stable-8b3db9c542e18b71d4820da4dd9401ee030feacb.tar.gz
linux-stable-8b3db9c542e18b71d4820da4dd9401ee030feacb.tar.bz2
linux-stable-8b3db9c542e18b71d4820da4dd9401ee030feacb.zip
[PATCH] lockdep: add DECLARE_COMPLETION_ONSTACK() API
lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Introduce the API. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/completion.h')
-rw-r--r--include/linux/completion.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 90663ad217f9..251c41e3ddd5 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -21,6 +21,18 @@ struct completion {
#define DECLARE_COMPLETION(work) \
struct completion work = COMPLETION_INITIALIZER(work)
+/*
+ * Lockdep needs to run a non-constant initializer for on-stack
+ * completions - so we use the _ONSTACK() variant for those that
+ * are on the kernel stack:
+ */
+#ifdef CONFIG_LOCKDEP
+# define DECLARE_COMPLETION_ONSTACK(work) \
+ struct completion work = ({ init_completion(&work); work; })
+#else
+# define DECLARE_COMPLETION_ONSTACK(work) DECLARE_COMPLETION(work)
+#endif
+
static inline void init_completion(struct completion *x)
{
x->done = 0;