Skip to contentSkip to conversation

x86 VSDO: fix Kconfig help

PATCH In review Randy Dunlap 3 participants 4 messages Nov 10, 2009 – Nov 11, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86 VSDO: fix Kconfig help

From: Randy Dunlap <[email protected]>

COMPAT_VDSO has 2 help text blocks, but kconfig only uses the last one found, so merge the 2 blocks.

It would be real nice if kconfig would warn about this.

---
 arch/x86/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/Kconfig +2 -2
@@ -1601,12 +1601,12 @@ config COMPAT_VDSO
 	prompt "Compat VDSO support"
 	depends on X86_32 || IA32_EMULATION
 	---help---
-	  Map the 32-bit VDSO to the predictable old-style address too.
-	---help---
 	  Say N here if you are running a sufficiently recent glibc
 	  version (2.3.3 or later), to remove the high-mapped
 	  VDSO mapping and to exclusively use the randomized VDSO.
 
+	  Map the 32-bit VDSO to the predictable old-style address too.
+
 	  If unsure, say Y.
 
 config CMDLINE_BOOL
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

COMPAT_VDSO has 2 help text blocks, but kconfig only uses the last one found, so merge the 2 blocks.

It would be real nice if kconfig would warn about this.

Looks good.

Thanks!

Quoted 27 lines

---
 arch/x86/Kconfig |    4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/Kconfig +0 -0
@@ -1601,12 +1601,12 @@ config COMPAT_VDSO

       prompt "Compat VDSO support"
       depends on X86_32 || IA32_EMULATION
       ---help---
-         Map the 32-bit VDSO to the predictable old-style address too.
-       ---help---
         Say N here if you are running a sufficiently recent glibc version (2.3.3 or later), to remove the high-mapped VDSO mapping and to exclusively use the randomized VDSO.

+         Map the 32-bit VDSO to the predictable old-style address too. +
         If unsure, say Y.

 config CMDLINE_BOOL
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

#2 lore raw
In reply to Randy Dunlap
Quoted 17 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

COMPAT_VDSO has 2 help text blocks, but kconfig only uses the last one found, so merge the 2 blocks.

It would be real nice if kconfig would warn about this.

---
 arch/x86/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/Kconfig +0 -0
@@ -1601,12 +1601,12 @@ config COMPAT_VDSO
 	prompt "Compat VDSO support"
 	depends on X86_32 || IA32_EMULATION

arch/x86/Kconfig config COMPAT_VDSO · line 1610

Quoted 10 lines
arch/x86/Kconfig +2 -2
 	---help---
-	  Map the 32-bit VDSO to the predictable old-style address too.
-	---help---
 	  Say N here if you are running a sufficiently recent glibc
 	  version (2.3.3 or later), to remove the high-mapped
 	  VDSO mapping and to exclusively use the randomized VDSO.
 
+	  Map the 32-bit VDSO to the predictable old-style address too.
+
 	  If unsure, say Y.

I've applied it with the original ordering of the lines - it makes more sense that way. (first short summary of what the option does, then a longer paragraph.)

Ingo

#3 lore raw

[tip:x86/urgent] x86 VSDO: Fix Kconfig help

In reply to Randy Dunlap
Commit-ID:  e84446de5cccd90de7d7ec46527d3b343b022a09
Gitweb:     http://git.kernel.org/tip/e84446de5cccd90de7d7ec46527d3b343b022a09
Author:     Randy Dunlap <[email protected]>
AuthorDate: Tue, 10 Nov 2009 15:46:52 -0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 11 Nov 2009 07:26:41 +0100

x86 VSDO: Fix Kconfig help

COMPAT_VDSO has 2 help text blocks, but kconfig only uses the last one found, so merge the 2 blocks.

It would be real nice if kconfig would warn about this.

LKML-Reference: <[email protected]>

---
 arch/x86/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/Kconfig +1 -1
index 72ace95..618dede 100644
@@ -1602,7 +1602,7 @@ config COMPAT_VDSO
 	depends on X86_32 || IA32_EMULATION
 	---help---
 	  Map the 32-bit VDSO to the predictable old-style address too.
-	---help---
+
 	  Say N here if you are running a sufficiently recent glibc
 	  version (2.3.3 or later), to remove the high-mapped
 	  VDSO mapping and to exclusively use the randomized VDSO.