aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/completion.h8
-rw-r--r--lib/Kconfig.debug4
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 9bcebf509b4d..791f053f28b7 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -9,7 +9,7 @@
9 */ 9 */
10 10
11#include <linux/wait.h> 11#include <linux/wait.h>
12#ifdef CONFIG_LOCKDEP_COMPLETE 12#ifdef CONFIG_LOCKDEP_COMPLETIONS
13#include <linux/lockdep.h> 13#include <linux/lockdep.h>
14#endif 14#endif
15 15
@@ -28,12 +28,12 @@
28struct completion { 28struct completion {
29 unsigned int done; 29 unsigned int done;
30 wait_queue_head_t wait; 30 wait_queue_head_t wait;
31#ifdef CONFIG_LOCKDEP_COMPLETE 31#ifdef CONFIG_LOCKDEP_COMPLETIONS
32 struct lockdep_map_cross map; 32 struct lockdep_map_cross map;
33#endif 33#endif
34}; 34};
35 35
36#ifdef CONFIG_LOCKDEP_COMPLETE 36#ifdef CONFIG_LOCKDEP_COMPLETIONS
37static inline void complete_acquire(struct completion *x) 37static inline void complete_acquire(struct completion *x)
38{ 38{
39 lock_acquire_exclusive((struct lockdep_map *)&x->map, 0, 0, NULL, _RET_IP_); 39 lock_acquire_exclusive((struct lockdep_map *)&x->map, 0, 0, NULL, _RET_IP_);
@@ -64,7 +64,7 @@ static inline void complete_release(struct completion *x) {}
64static inline void complete_release_commit(struct completion *x) {} 64static inline void complete_release_commit(struct completion *x) {}
65#endif 65#endif
66 66
67#ifdef CONFIG_LOCKDEP_COMPLETE 67#ifdef CONFIG_LOCKDEP_COMPLETIONS
68#define COMPLETION_INITIALIZER(work) \ 68#define COMPLETION_INITIALIZER(work) \
69 { 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait), \ 69 { 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait), \
70 STATIC_CROSS_LOCKDEP_MAP_INIT("(complete)" #work, &(work)) } 70 STATIC_CROSS_LOCKDEP_MAP_INIT("(complete)" #work, &(work)) }
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 8fb8a206db12..a0e60d56303e 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1082,7 +1082,7 @@ config PROVE_LOCKING
1082 select DEBUG_RT_MUTEXES if RT_MUTEXES 1082 select DEBUG_RT_MUTEXES if RT_MUTEXES
1083 select DEBUG_LOCK_ALLOC 1083 select DEBUG_LOCK_ALLOC
1084 select LOCKDEP_CROSSRELEASE 1084 select LOCKDEP_CROSSRELEASE
1085 select LOCKDEP_COMPLETE 1085 select LOCKDEP_COMPLETIONS
1086 select TRACE_IRQFLAGS 1086 select TRACE_IRQFLAGS
1087 default n 1087 default n
1088 help 1088 help
@@ -1162,7 +1162,7 @@ config LOCKDEP_CROSSRELEASE
1162 such as page locks or completions can use the lock correctness 1162 such as page locks or completions can use the lock correctness
1163 detector, lockdep. 1163 detector, lockdep.
1164 1164
1165config LOCKDEP_COMPLETE 1165config LOCKDEP_COMPLETIONS
1166 bool "Lock debugging: allow completions to use deadlock detector" 1166 bool "Lock debugging: allow completions to use deadlock detector"
1167 help 1167 help
1168 A deadlock caused by wait_for_completion() and complete() can be 1168 A deadlock caused by wait_for_completion() and complete() can be