Re: [tip:locking/core] locking/lockdep: Make CONFIG_LOCKDEP_CROSSRELEASE part of CONFIG_PROVE_LOCKING

[Ingo Molnar]

* tip-bot for Byungchul Park <tipbot@xxxxxxxxx> wrote:

> Commit-ID:  d0541b0fa64b36665d6261079974a26943c75009
> Gitweb:     http://git.kernel.org/tip/d0541b0fa64b36665d6261079974a26943c75009
> Author:     Byungchul Park <byungchul.park@xxxxxxx>
> AuthorDate: Thu, 17 Aug 2017 17:57:39 +0900
> Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
> CommitDate: Thu, 17 Aug 2017 11:38:54 +0200
> 
> locking/lockdep: Make CONFIG_LOCKDEP_CROSSRELEASE part of CONFIG_PROVE_LOCKING
> 
> Crossrelease support added the CONFIG_LOCKDEP_CROSSRELEASE and CONFIG_LOCKDEP_COMPLETE
> options. It makes little sense to enable them when PROVE_LOCKING is disabled.
> 
> Make them non-interative options and part of PROVE_LOCKING to simplify the UI.
> 
> Signed-off-by: Byungchul Park <byungchul.park@xxxxxxx>
> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: kernel-team@xxxxxxx
> Link: http://lkml.kernel.org/r/1502960261-16206-1-git-send-email-byungchul.park@xxxxxxx
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
> ---
>  lib/Kconfig.debug | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index ebd40d3..1ad7f1b 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -1081,6 +1081,8 @@ config PROVE_LOCKING
>  	select DEBUG_MUTEXES
>  	select DEBUG_RT_MUTEXES if RT_MUTEXES
>  	select DEBUG_LOCK_ALLOC
> +	select LOCKDEP_CROSSRELEASE
> +	select LOCKDEP_COMPLETE
>  	select TRACE_IRQFLAGS
>  	default n
>  	help
> @@ -1152,8 +1154,6 @@ config LOCK_STAT
>  
>  config LOCKDEP_CROSSRELEASE
>  	bool "Lock debugging: make lockdep work for crosslocks"
> -	depends on PROVE_LOCKING
> -	default n
>  	help
>  	 This makes lockdep work for crosslock which is a lock allowed to
>  	 be released in a different context from the acquisition context.
> @@ -1164,9 +1164,6 @@ config LOCKDEP_CROSSRELEASE
>  
>  config LOCKDEP_COMPLETE
>  	bool "Lock debugging: allow completions to use deadlock detector"
> -	depends on PROVE_LOCKING
> -	select LOCKDEP_CROSSRELEASE
> -	default n
>  	help

Yeah, so I only noticed this after committing the patches, but this change does 
not make the option non-interactive. The way to do that is to remove the "" help 
text, i.e. make it a simple 'bool'.

I'll do that and re-push.

Thanks,

	Ingo