[PATCH v3 3/3] lockdep: Rename LOCKDEP_COMPLETE config

From: Byungchul Park
Date: Thu Aug 17 2017 - 04:57:57 EST


'complete' is an adjective and sounds like 'lockdep is complete'.
Anyway, it was not named properly. LOCKDEP_COMPLETIONS would be
better to explain what it represents.

Signed-off-by: Byungchul Park <byungchul.park@xxxxxxx>
---
include/linux/completion.h | 8 ++++----
lib/Kconfig.debug | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/completion.h b/include/linux/completion.h
index 9bcebf5..791f053 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -9,7 +9,7 @@
*/

#include <linux/wait.h>
-#ifdef CONFIG_LOCKDEP_COMPLETE
+#ifdef CONFIG_LOCKDEP_COMPLETIONS
#include <linux/lockdep.h>
#endif

@@ -28,12 +28,12 @@
struct completion {
unsigned int done;
wait_queue_head_t wait;
-#ifdef CONFIG_LOCKDEP_COMPLETE
+#ifdef CONFIG_LOCKDEP_COMPLETIONS
struct lockdep_map_cross map;
#endif
};

-#ifdef CONFIG_LOCKDEP_COMPLETE
+#ifdef CONFIG_LOCKDEP_COMPLETIONS
static inline void complete_acquire(struct completion *x)
{
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) {}
static inline void complete_release_commit(struct completion *x) {}
#endif

-#ifdef CONFIG_LOCKDEP_COMPLETE
+#ifdef CONFIG_LOCKDEP_COMPLETIONS
#define COMPLETION_INITIALIZER(work) \
{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait), \
STATIC_CROSS_LOCKDEP_MAP_INIT("(complete)" #work, &(work)) }
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 444bb7b..8524eba 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1085,7 +1085,7 @@ config PROVE_LOCKING
select DEBUG_RT_MUTEXES if RT_MUTEXES
select DEBUG_LOCK_ALLOC
select LOCKDEP_CROSSRELEASE
- select LOCKDEP_COMPLETE
+ select LOCKDEP_COMPLETIONS
select TRACE_IRQFLAGS
default n
help
@@ -1165,7 +1165,7 @@ config LOCKDEP_CROSSRELEASE
such as page locks or completions can use the lock correctness
detector, lockdep.

-config LOCKDEP_COMPLETE
+config LOCKDEP_COMPLETIONS
bool "Lock debugging: allow completions to use deadlock detector"
help
A deadlock caused by wait_for_completion() and complete() can be
--
1.9.1