These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / completion.h

diff --git a/kernel/include/linux/completion.h b/kernel/include/linux/completion.h
index 3fe8d14..3bca159 100644 (file)
--- a/kernel/include/linux/completion.h
+++ b/kernel/include/linux/completion.h
@@ -7,7 +7,7 @@
  * Atomic wait-for-completion handler data structures.
  * See kernel/sched/completion.c for details.
  */
-#include <linux/wait-simple.h>
+#include <linux/swait.h>
 
 /*
  * struct completion - structure used to maintain state for a "completion"
@@ -23,11 +23,11 @@
  */
 struct completion {
        unsigned int done;
-       struct swait_head wait;
+       struct swait_queue_head wait;
 };
 
 #define COMPLETION_INITIALIZER(work) \
-       { 0, SWAIT_HEAD_INITIALIZER((work).wait) }
+       { 0, __SWAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
 
 #define COMPLETION_INITIALIZER_ONSTACK(work) \
        ({ init_completion(&work); work; })
@@ -72,7 +72,7 @@ struct completion {
 static inline void init_completion(struct completion *x)
 {
        x->done = 0;
-       init_swait_head(&x->wait);
+       init_swait_queue_head(&x->wait);
 }
 
 /**