From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754779AbbEMXhj (ORCPT ); Wed, 13 May 2015 19:37:39 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:55066 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754715AbbEMXhh (ORCPT ); Wed, 13 May 2015 19:37:37 -0400 X-Originating-IP: 173.246.103.110 Date: Wed, 13 May 2015 16:37:27 -0700 From: Josh Triplett To: Ingo Molnar , Andrew Morton , "Paul E. McKenney" , Michal Hocko , Josh Triplett , Vladimir Davydov , Johannes Weiner , Geert Uytterhoeven , Andy Lutomirski , Bertrand Jacquin , "Luis R. Rodriguez" , Iulia Manda , Pranith Kumar , Clark Williams , Mel Gorman , Randy Dunlap , Paul Bolle , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] init/Kconfig: Fix break in middle of EXPERT menu Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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