Commit ea3f2c0f authored by Byungchul Park's avatar Byungchul Park Committed by Ingo Molnar
Browse files

locking/lockdep: Rename CONFIG_LOCKDEP_COMPLETE to CONFIG_LOCKDEP_COMPLETIONS 



'complete' is an adjective and LOCKDEP_COMPLETE sounds like 'lockdep is complete',
so pick a better name that uses a noun.

Signed-off-by: default avatarByungchul Park <byungchul.park@lge.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kernel-team@lge.com
Link: http://lkml.kernel.org/r/1502960261-16206-3-git-send-email-byungchul.park@lge.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0f0a2226

include/linux/completion.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */

 */





#include <linux/wait.h>

#include <linux/wait.h>

#ifdef CONFIG_LOCKDEP_COMPLETE

#ifdef CONFIG_LOCKDEP_COMPLETIONS

#include <linux/lockdep.h>

#include <linux/lockdep.h>

#endif

#endif
@@ -28,12 +28,12 @@ 
struct completion {

struct completion {

	unsigned int done;

	unsigned int done;

	wait_queue_head_t wait;

	wait_queue_head_t wait;

#ifdef CONFIG_LOCKDEP_COMPLETE

#ifdef CONFIG_LOCKDEP_COMPLETIONS

	struct lockdep_map_cross map;

	struct lockdep_map_cross map;

#endif

#endif

};

};





#ifdef CONFIG_LOCKDEP_COMPLETE

#ifdef CONFIG_LOCKDEP_COMPLETIONS

static inline void complete_acquire(struct completion *x)

static inline void complete_acquire(struct completion *x)

{

{

	lock_acquire_exclusive((struct lockdep_map *)&x->map, 0, 0, NULL, _RET_IP_);

	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) {}

static inline void complete_release_commit(struct completion *x) {}

#endif

#endif





#ifdef CONFIG_LOCKDEP_COMPLETE

#ifdef CONFIG_LOCKDEP_COMPLETIONS

#define COMPLETION_INITIALIZER(work) \

#define COMPLETION_INITIALIZER(work) \

	{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait), \

	{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait), \

	STATIC_CROSS_LOCKDEP_MAP_INIT("(complete)" #work, &(work)) }

	STATIC_CROSS_LOCKDEP_MAP_INIT("(complete)" #work, &(work)) }

lib/Kconfig.debug

+2 −2
Original line number Original line Diff line number Diff line
@@ -1082,7 +1082,7 @@ config PROVE_LOCKING 
	select DEBUG_RT_MUTEXES if RT_MUTEXES

	select DEBUG_RT_MUTEXES if RT_MUTEXES

	select DEBUG_LOCK_ALLOC

	select DEBUG_LOCK_ALLOC

	select LOCKDEP_CROSSRELEASE

	select LOCKDEP_CROSSRELEASE

	select LOCKDEP_COMPLETE

	select LOCKDEP_COMPLETIONS

	select TRACE_IRQFLAGS

	select TRACE_IRQFLAGS

	default n

	default n

	help

	help
@@ -1162,7 +1162,7 @@ config LOCKDEP_CROSSRELEASE 
	 such as page locks or completions can use the lock correctness

	 such as page locks or completions can use the lock correctness

	 detector, lockdep.

	 detector, lockdep.





config LOCKDEP_COMPLETE

config LOCKDEP_COMPLETIONS

	bool "Lock debugging: allow completions to use deadlock detector"

	bool "Lock debugging: allow completions to use deadlock detector"

	help

	help

	 A deadlock caused by wait_for_completion() and complete() can be

	 A deadlock caused by wait_for_completion() and complete() can be

CRA Git | Maintained and supported by SUSTech CRA and CCSE