[PATCH] x86 VSDO: fix Kconfig help

[PATCH] x86 VSDO: fix Kconfig help

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

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.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 arch/x86/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- lnx-2632-rc6.orig/arch/x86/Kconfig
+++ lnx-2632-rc6/arch/x86/Kconfig
@@ -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

Re: [PATCH] x86 VSDO: fix Kconfig help

[Américo Wang]

On Wed, Nov 11, 2009 at 7:46 AM, Randy Dunlap <randy.dunlap@oracle.com> wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> 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.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

Looks good.

Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com>

Thanks!

> ---
>  arch/x86/Kconfig |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- lnx-2632-rc6.orig/arch/x86/Kconfig
> +++ lnx-2632-rc6/arch/x86/Kconfig
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

Re: [PATCH] x86 VSDO: fix Kconfig help

[Ingo Molnar]

* Randy Dunlap <randy.dunlap@oracle.com> wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> 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.
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
>  arch/x86/Kconfig |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- lnx-2632-rc6.orig/arch/x86/Kconfig
> +++ lnx-2632-rc6/arch/x86/Kconfig
> @@ -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.

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

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

[tip-bot for Randy Dunlap]

Commit-ID:  e84446de5cccd90de7d7ec46527d3b343b022a09
Gitweb:     http://git.kernel.org/tip/e84446de5cccd90de7d7ec46527d3b343b022a09
Author:     Randy Dunlap <randy.dunlap@oracle.com>
AuthorDate: Tue, 10 Nov 2009 15:46:52 -0800
Committer:  Ingo Molnar <mingo@elte.hu>
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.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
LKML-Reference: <4AF9FB6C.70003@oracle.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 72ace95..618dede 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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.