x86 VSDO: Fix Kconfig help
authorRandy Dunlap <randy.dunlap@oracle.com>
Tue, 10 Nov 2009 23:46:52 +0000 (15:46 -0800)
committerIngo Molnar <mingo@elte.hu>
Wed, 11 Nov 2009 06:26:41 +0000 (07:26 +0100)
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

index 72ace9515a07a44525778899e1ea04b32b3accbc..618dedeb31fc2adc88744c26c24c2f74def1b095 100644 (file)
@@ -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.