On Thu, May 14, 2015 at 08:35:23AM -0700, Josh Triplett wrote: > Commit e1abf2cc8d5 ("bpf: Fix the build on BPF_SYSCALL=y && > !CONFIG_TRACING kernels, make it more configurable") made BPF_SYSCALL no > longer hidden with !EXPERT, but left it in the middle of the EXPERT > menu. menuconfig stops putting config items under a submenu once it > encounters an item that doesn't depend on the menu's config item, so > this caused the remainder of the EXPERT menu to spill out into the > containing menu around it. Fix by moving BPF_SYSCALL before the EXPERT > menu, next to BPF. > > Fixes: e1abf2cc8d5 ("bpf: Fix the build on BPF_SYSCALL=y && !CONFIG_TRACING kernels, make it more configurable") > Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx> > --- This series should have been labeled as "v2". Changes in v2: added CCs to Michal Marek <mmarek@xxxxxxx> and linux-kbuild@xxxxxxxxxxxxxxx, split patch 4/4 into two patches, and added Paul's ack to those last two patches. > init/Kconfig | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/init/Kconfig b/init/Kconfig > index dc24dec..e2f16f1 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -1341,6 +1341,16 @@ config HAVE_PCSPKR_PLATFORM > config BPF > bool > > +# syscall, maps, verifier > +config BPF_SYSCALL > + bool "Enable bpf() system call" > + select ANON_INODES > + select BPF > + default n > + help > + Enable the bpf() system call that allows to manipulate eBPF > + programs and maps via file descriptors. > + > menuconfig EXPERT > bool "Configure standard kernel features (expert users)" > # Unhide debug options, to make the on-by-default options visible > @@ -1535,16 +1545,6 @@ config EVENTFD > > If unsure, say Y. > > -# syscall, maps, verifier > -config BPF_SYSCALL > - bool "Enable bpf() system call" > - select ANON_INODES > - select BPF > - default n > - help > - Enable the bpf() system call that allows to manipulate eBPF > - programs and maps via file descriptors. > - > config SHMEM > bool "Use full shmem filesystem" if EXPERT > default y > -- > 2.1.4 > -- 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