[PATCH] locking: remove three unused Kconfig symbols

[PATCH] locking: remove three unused Kconfig symbols

[Paul Bolle]

The Kconfig symbols ARCH_INLINE_READ_UNLOCK_IRQ,
ARCH_INLINE_SPIN_UNLOCK_IRQ, and ARCH_INLINE_WRITE_UNLOCK_IRQ were added
in v2.6.33, but have never actually been used. It is safe to remove
these.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Untested. These three symbols were added in commit
6beb000923882f6204ea2cfcd932e568e900803f ("locking: Make inlining
decision Kconfig based").

 arch/s390/Kconfig    |  3 ---
 kernel/Kconfig.locks | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index eb8fb62..8c544d2 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -70,7 +70,6 @@ config S390
 	select ARCH_INLINE_READ_TRYLOCK
 	select ARCH_INLINE_READ_UNLOCK
 	select ARCH_INLINE_READ_UNLOCK_BH
-	select ARCH_INLINE_READ_UNLOCK_IRQ
 	select ARCH_INLINE_READ_UNLOCK_IRQRESTORE
 	select ARCH_INLINE_SPIN_LOCK
 	select ARCH_INLINE_SPIN_LOCK_BH
@@ -80,7 +79,6 @@ config S390
 	select ARCH_INLINE_SPIN_TRYLOCK_BH
 	select ARCH_INLINE_SPIN_UNLOCK
 	select ARCH_INLINE_SPIN_UNLOCK_BH
-	select ARCH_INLINE_SPIN_UNLOCK_IRQ
 	select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
 	select ARCH_INLINE_WRITE_LOCK
 	select ARCH_INLINE_WRITE_LOCK_BH
@@ -89,7 +87,6 @@ config S390
 	select ARCH_INLINE_WRITE_TRYLOCK
 	select ARCH_INLINE_WRITE_UNLOCK
 	select ARCH_INLINE_WRITE_UNLOCK_BH
-	select ARCH_INLINE_WRITE_UNLOCK_IRQ
 	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 	select ARCH_SAVE_PAGE_KEYS if HIBERNATION
 	select ARCH_WANT_IPC_PARSE_VERSION
diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
index 44511d1..c438507 100644
--- a/kernel/Kconfig.locks
+++ b/kernel/Kconfig.locks
@@ -25,9 +25,6 @@ config ARCH_INLINE_SPIN_UNLOCK
 config ARCH_INLINE_SPIN_UNLOCK_BH
 	bool
 
-config ARCH_INLINE_SPIN_UNLOCK_IRQ
-	bool
-
 config ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
 	bool
 
@@ -53,13 +50,9 @@ config ARCH_INLINE_READ_UNLOCK
 config ARCH_INLINE_READ_UNLOCK_BH
 	bool
 
-config ARCH_INLINE_READ_UNLOCK_IRQ
-	bool
-
 config ARCH_INLINE_READ_UNLOCK_IRQRESTORE
 	bool
 
-
 config ARCH_INLINE_WRITE_TRYLOCK
 	bool
 
@@ -81,9 +74,6 @@ config ARCH_INLINE_WRITE_UNLOCK
 config ARCH_INLINE_WRITE_UNLOCK_BH
 	bool
 
-config ARCH_INLINE_WRITE_UNLOCK_IRQ
-	bool
-
 config ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 	bool
 
-- 
1.7.11.7

Re: [PATCH] locking: remove three unused Kconfig symbols

[Ingo Molnar]

* Paul Bolle <pebolle@tiscali.nl> wrote:

> The Kconfig symbols ARCH_INLINE_READ_UNLOCK_IRQ,
> ARCH_INLINE_SPIN_UNLOCK_IRQ, and ARCH_INLINE_WRITE_UNLOCK_IRQ were added
> in v2.6.33, but have never actually been used. It is safe to remove
> these.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Untested. These three symbols were added in commit
> 6beb000923882f6204ea2cfcd932e568e900803f ("locking: Make inlining
> decision Kconfig based").
> 
>  arch/s390/Kconfig    |  3 ---
>  kernel/Kconfig.locks | 10 ----------
>  2 files changed, 13 deletions(-)
> 
> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
> index eb8fb62..8c544d2 100644
> --- a/arch/s390/Kconfig
> +++ b/arch/s390/Kconfig
> @@ -70,7 +70,6 @@ config S390
>  	select ARCH_INLINE_READ_TRYLOCK
>  	select ARCH_INLINE_READ_UNLOCK
>  	select ARCH_INLINE_READ_UNLOCK_BH
> -	select ARCH_INLINE_READ_UNLOCK_IRQ
>  	select ARCH_INLINE_READ_UNLOCK_IRQRESTORE
>  	select ARCH_INLINE_SPIN_LOCK
>  	select ARCH_INLINE_SPIN_LOCK_BH
> @@ -80,7 +79,6 @@ config S390
>  	select ARCH_INLINE_SPIN_TRYLOCK_BH
>  	select ARCH_INLINE_SPIN_UNLOCK
>  	select ARCH_INLINE_SPIN_UNLOCK_BH
> -	select ARCH_INLINE_SPIN_UNLOCK_IRQ
>  	select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
>  	select ARCH_INLINE_WRITE_LOCK
>  	select ARCH_INLINE_WRITE_LOCK_BH
> @@ -89,7 +87,6 @@ config S390
>  	select ARCH_INLINE_WRITE_TRYLOCK
>  	select ARCH_INLINE_WRITE_UNLOCK
>  	select ARCH_INLINE_WRITE_UNLOCK_BH
> -	select ARCH_INLINE_WRITE_UNLOCK_IRQ
>  	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
>  	select ARCH_SAVE_PAGE_KEYS if HIBERNATION
>  	select ARCH_WANT_IPC_PARSE_VERSION
> diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
> index 44511d1..c438507 100644
> --- a/kernel/Kconfig.locks
> +++ b/kernel/Kconfig.locks
> @@ -25,9 +25,6 @@ config ARCH_INLINE_SPIN_UNLOCK
>  config ARCH_INLINE_SPIN_UNLOCK_BH
>  	bool
>  
> -config ARCH_INLINE_SPIN_UNLOCK_IRQ
> -	bool
> -
>  config ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
>  	bool
>  
> @@ -53,13 +50,9 @@ config ARCH_INLINE_READ_UNLOCK
>  config ARCH_INLINE_READ_UNLOCK_BH
>  	bool
>  
> -config ARCH_INLINE_READ_UNLOCK_IRQ
> -	bool
> -
>  config ARCH_INLINE_READ_UNLOCK_IRQRESTORE
>  	bool
>  
> -
>  config ARCH_INLINE_WRITE_TRYLOCK
>  	bool
>  
> @@ -81,9 +74,6 @@ config ARCH_INLINE_WRITE_UNLOCK
>  config ARCH_INLINE_WRITE_UNLOCK_BH
>  	bool
>  
> -config ARCH_INLINE_WRITE_UNLOCK_IRQ
> -	bool
> -
>  config ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
>  	bool

Erm, if you look at the code in question you'll see that they are unused I think 
due to a bug:

 config INLINE_READ_UNLOCK_IRQ
        def_bool y
        depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_BH

Shouldn't that depend on ARCH_INLINE_READ_UNLOCK_IRQ?

Similarly for the others.

Thanks,

	Ingo

Re: [PATCH] locking: remove three unused Kconfig symbols

[Paul Bolle]

On Mon, 2013-04-08 at 17:16 +0200, Ingo Molnar wrote:
> * Paul Bolle <pebolle@tiscali.nl> wrote:
> > The Kconfig symbols ARCH_INLINE_READ_UNLOCK_IRQ,
> > ARCH_INLINE_SPIN_UNLOCK_IRQ, and ARCH_INLINE_WRITE_UNLOCK_IRQ were added
> > in v2.6.33, but have never actually been used. It is safe to remove
> > these.
> > 
> Erm, if you look at the code in question you'll see that they are unused I think 
> due to a bug:
> 
>  config INLINE_READ_UNLOCK_IRQ
>         def_bool y
>         depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_BH
> 
> Shouldn't that depend on ARCH_INLINE_READ_UNLOCK_IRQ?
> 
> Similarly for the others.

Yes, that seems correct. I must admit that I didn't spot that
possibility, but then again this Kconfig file is near unreadable (too
much repetition for human readers).

Would you have any idea why this problem wasn't noticed in 16 (!)
releases? Fedora 17, which I did this patch on, has Kconfig symbolk
PREEMPT not set. Is it perhaps commit to not enable that option?


Paul Bolle

Re: [PATCH] locking: remove three unused Kconfig symbols

[Paul Bolle]

On Mon, 2013-04-08 at 17:30 +0200, Paul Bolle wrote:
> Would you have any idea why this problem wasn't noticed in 16 (!)
> releases? Fedora 17, which I did this patch on, has Kconfig symbolk
> PREEMPT not set. Is it perhaps commit to not enable that option?

s/commit/common/ (and, obviously, s/symbolk/symbol/).


Paul Bolle

Re: [PATCH] locking: remove three unused Kconfig symbols

[Ingo Molnar]

* Paul Bolle <pebolle@tiscali.nl> wrote:

> On Mon, 2013-04-08 at 17:16 +0200, Ingo Molnar wrote:
> > * Paul Bolle <pebolle@tiscali.nl> wrote:
> > > The Kconfig symbols ARCH_INLINE_READ_UNLOCK_IRQ,
> > > ARCH_INLINE_SPIN_UNLOCK_IRQ, and ARCH_INLINE_WRITE_UNLOCK_IRQ were added
> > > in v2.6.33, but have never actually been used. It is safe to remove
> > > these.
> > > 
> > Erm, if you look at the code in question you'll see that they are unused I think 
> > due to a bug:
> > 
> >  config INLINE_READ_UNLOCK_IRQ
> >         def_bool y
> >         depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_BH
> > 
> > Shouldn't that depend on ARCH_INLINE_READ_UNLOCK_IRQ?
> > 
> > Similarly for the others.
> 
> Yes, that seems correct. I must admit that I didn't spot that
> possibility, but then again this Kconfig file is near unreadable (too
> much repetition for human readers).

Yeah, Kconfig isn't a very sophisticated language - it's the COBOL of config 
languages.

> Would you have any idea why this problem wasn't noticed in 16 (!) releases? 
> Fedora 17, which I did this patch on, has Kconfig symbolk PREEMPT not set. Is it 
> perhaps commit to not enable that option?

AFAICS it's a latent bug: it can only be noticed if these switches are set to 
different values by an arch - but the defaults and s390 (the two main cases) never 
do that.

So it's not causing any runtime problems today - but should be fixed nevertheless, 
now that you noticed it! :-)

Thanks,

	Ingo

[PATCH v2] locking: Fix copy/paste errors "ARCH_INLINE_*_UNLOCK_BH"

[Paul Bolle]

The Kconfig symbols ARCH_INLINE_READ_UNLOCK_IRQ,
ARCH_INLINE_SPIN_UNLOCK_IRQ, and ARCH_INLINE_WRITE_UNLOCK_IRQ were added
in v2.6.33, but have never actually been used. Ingo Molnar spotted that
this is caused by three identical copy/paste erros. Eg, the Kconfig
entry for
         INLINE_READ_UNLOCK_IRQ

has an (optional) dependency on
    ARCH_INLINE_READ_UNLOCK_BH

were it apparently should depend on
    ARCH_INLINE_READ_UNLOCK_IRQ

instead. Likewise for the Kconfig entries for INLINE_SPIN_UNLOCK_IRQ and
INLINE_WRITE_UNLOCK_IRQ. Fix these three errors.

Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) v1 was titled "locking: remove three unused Kconfig symbols".

1) Still untested.

 kernel/Kconfig.locks | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
index 44511d1..d2b32ac 100644
--- a/kernel/Kconfig.locks
+++ b/kernel/Kconfig.locks
@@ -138,7 +138,7 @@ config INLINE_SPIN_UNLOCK_BH
 
 config INLINE_SPIN_UNLOCK_IRQ
 	def_bool y
-	depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_BH
+	depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_IRQ
 
 config INLINE_SPIN_UNLOCK_IRQRESTORE
 	def_bool y
@@ -175,7 +175,7 @@ config INLINE_READ_UNLOCK_BH
 
 config INLINE_READ_UNLOCK_IRQ
 	def_bool y
-	depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_BH
+	depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_IRQ
 
 config INLINE_READ_UNLOCK_IRQRESTORE
 	def_bool y
@@ -212,7 +212,7 @@ config INLINE_WRITE_UNLOCK_BH
 
 config INLINE_WRITE_UNLOCK_IRQ
 	def_bool y
-	depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_BH
+	depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_IRQ
 
 config INLINE_WRITE_UNLOCK_IRQRESTORE
 	def_bool y
-- 
1.7.11.7

Re: [PATCH v2] locking: Fix copy/paste errors "ARCH_INLINE_*_UNLOCK_BH"

[Peter Zijlstra]

On Fri, May 17, 2013 at 10:51:33AM +0200, Paul Bolle wrote:
> The Kconfig symbols ARCH_INLINE_READ_UNLOCK_IRQ,
> ARCH_INLINE_SPIN_UNLOCK_IRQ, and ARCH_INLINE_WRITE_UNLOCK_IRQ were added
> in v2.6.33, but have never actually been used. Ingo Molnar spotted that
> this is caused by three identical copy/paste erros. Eg, the Kconfig
> entry for
>          INLINE_READ_UNLOCK_IRQ
> 
> has an (optional) dependency on
>     ARCH_INLINE_READ_UNLOCK_BH
> 
> were it apparently should depend on
>     ARCH_INLINE_READ_UNLOCK_IRQ
> 
> instead. Likewise for the Kconfig entries for INLINE_SPIN_UNLOCK_IRQ and
> INLINE_WRITE_UNLOCK_IRQ. Fix these three errors.
> 
> Reported-by: Ingo Molnar <mingo@kernel.org>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

Thanks!

[tip:core/locking] locking: Fix copy/paste errors of " ARCH_INLINE_*_UNLOCK_BH"

[tip-bot for Paul Bolle]

Commit-ID:  4eedb77a9cd8f2e68b31c8b9a20524a50727c16f
Gitweb:     http://git.kernel.org/tip/4eedb77a9cd8f2e68b31c8b9a20524a50727c16f
Author:     Paul Bolle <pebolle@tiscali.nl>
AuthorDate: Fri, 17 May 2013 10:51:33 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 28 May 2013 08:50:00 +0200

locking: Fix copy/paste errors of "ARCH_INLINE_*_UNLOCK_BH"

The Kconfig symbols ARCH_INLINE_READ_UNLOCK_IRQ,
ARCH_INLINE_SPIN_UNLOCK_IRQ, and ARCH_INLINE_WRITE_UNLOCK_IRQ were added
in v2.6.33, but have never actually been used. Ingo Molnar spotted that
this is caused by three identical copy/paste erros. Eg, the Kconfig
entry for

    INLINE_READ_UNLOCK_IRQ

has an (optional) dependency on:

    ARCH_INLINE_READ_UNLOCK_BH

were it apparently should depend on:

    ARCH_INLINE_READ_UNLOCK_IRQ

instead. Likewise for the Kconfig entries for INLINE_SPIN_UNLOCK_IRQ and
INLINE_WRITE_UNLOCK_IRQ. Fix these three errors.

This never really caused any real problems as these symbols are set (or
unset) in a group - but it's worth fixing it nevertheless.

Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1368780693.1350.228.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/Kconfig.locks | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
index 44511d1..d2b32ac 100644
--- a/kernel/Kconfig.locks
+++ b/kernel/Kconfig.locks
@@ -138,7 +138,7 @@ config INLINE_SPIN_UNLOCK_BH
 
 config INLINE_SPIN_UNLOCK_IRQ
 	def_bool y
-	depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_BH
+	depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_IRQ
 
 config INLINE_SPIN_UNLOCK_IRQRESTORE
 	def_bool y
@@ -175,7 +175,7 @@ config INLINE_READ_UNLOCK_BH
 
 config INLINE_READ_UNLOCK_IRQ
 	def_bool y
-	depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_BH
+	depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_IRQ
 
 config INLINE_READ_UNLOCK_IRQRESTORE
 	def_bool y
@@ -212,7 +212,7 @@ config INLINE_WRITE_UNLOCK_BH
 
 config INLINE_WRITE_UNLOCK_IRQ
 	def_bool y
-	depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_BH
+	depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_IRQ
 
 config INLINE_WRITE_UNLOCK_IRQRESTORE
 	def_bool y