* Randy Dunlap <randy.dunlap@xxxxxxxxxx> wrote: > From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > > 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@xxxxxxxxxx> > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
