aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-11-10 18:46:52 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-11 01:26:41 -0500
commite84446de5cccd90de7d7ec46527d3b343b022a09 (patch)
tree403484364e7938809495e152fdbbd0e1537bcce3 /arch/x86/Kconfig
parente02e0e1a130b9ca37c5186d38ad4b3aaf58bb149 (diff)
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>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 72ace9515a07..618dedeb31fc 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1602,7 +1602,7 @@ config COMPAT_VDSO
1602 depends on X86_32 || IA32_EMULATION 1602 depends on X86_32 || IA32_EMULATION
1603 ---help--- 1603 ---help---
1604 Map the 32-bit VDSO to the predictable old-style address too. 1604 Map the 32-bit VDSO to the predictable old-style address too.
1605 ---help--- 1605
1606 Say N here if you are running a sufficiently recent glibc 1606 Say N here if you are running a sufficiently recent glibc
1607 version (2.3.3 or later), to remove the high-mapped 1607 version (2.3.3 or later), to remove the high-mapped
1608 VDSO mapping and to exclusively use the randomized VDSO. 1608 VDSO mapping and to exclusively use the randomized VDSO.