On Thu, 2015-05-14 at 08:35 -0700, Josh Triplett wrote: > The expert menu frequently gets broken by a config item in the middle > that leaves off the "if EXPERT" from its prompt. This results in the > remainder of the menu spilling out into the parent "General setup" menu. > Move the entire expert menu into a separate Kconfig file, > init/Kconfig.expert, to make this harder to do accidentally, and to > break up the exceedingly long init/Kconfig a bit. > > Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx> > --- a/init/Kconfig > +++ b/init/Kconfig > -config ADVISE_SYSCALLS > - bool "Enable madvise/fadvise syscalls" if EXPERT > - default y > - help > - This option enables the madvise and fadvise syscalls, used by > - applications to advise the kernel about their future memory or file > - usage, improving performance. If building an embedded system where no > - applications use these syscalls, you can disable this option to save > - space. > - In the meantime commit d6c6ae9b71ad ("userfaultfd: buildsystem activation") added config USERFAULTFD here in linux-next, pushing PCI_QUIRKS out of the menu. USERFAULTFD defaults to 'y'. Perhaps it was intended to make (its prompt) visible only if EXPERT is set. Andrea, Pavel, Andrew? > -config PCI_QUIRKS > - default y > - bool "Enable PCI quirk workarounds" if EXPERT > - depends on PCI > - help > - This enables workarounds for various PCI chipset > - bugs/quirks. Disable this only if your target machine is > - unaffected by PCI quirks. Anyhow, applied cleanly with d6c6ae9b71ad reverted. I had to jump through some hoops to convince myself the patch really only moves some lines around (except for the added source statement). There's no git diff option that could have helped me here, is there? I'm sure we'll figure out a way to handle config USERFAULTFD, so Acked-by: Paul Bolle <pebolle@xxxxxxxxxx> Thanks, Paul Bolle -- 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