aboutsummaryrefslogtreecommitdiff
path: root/init/Kconfig
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-10-03 16:19:24 -0700
committerJosh Triplett <josh@joshtriplett.org>2014-10-03 16:49:43 -0700
commit62b4d2041117f35ab2409c9f5c4b8d3dc8e59d0f (patch)
tree65a5cec8dbe6f0589de546419d822b5c841b3965 /init/Kconfig
parent361e9dfbaae84b0b246ed18d1ab7c82a1a41b53e (diff)
downloadlinux-linaro-stable-62b4d2041117f35ab2409c9f5c4b8d3dc8e59d0f.tar.gz
init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu
commit 03b8c7b623c80af264c4c8d6111e5c6289933666 ("futex: Allow architectures to skip futex_atomic_cmpxchg_inatomic() test") added the HAVE_FUTEX_CMPXCHG symbol right below FUTEX. This placed it right in the middle of the options for the EXPERT menu. However, HAVE_FUTEX_CMPXCHG does not depend on EXPERT or FUTEX, so Kconfig stops placing items in the EXPERT menu, and displays the remaining several EXPERT items (starting with EPOLL) directly in the General Setup menu. Since both users of HAVE_FUTEX_CMPXCHG only select it "if FUTEX", make HAVE_FUTEX_CMPXCHG itself depend on FUTEX. With this change, the subsequent items display as part of the EXPERT menu again; the EMBEDDED menu now appears as the next top-level item in the General Setup menu, which makes General Setup much shorter and more usable. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Cc: stable <stable@vger.kernel.org>
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 31505a52c165..80a6907f91c5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1477,6 +1477,7 @@ config FUTEX
config HAVE_FUTEX_CMPXCHG
bool
+ depends on FUTEX
help
Architectures should select this if futex_atomic_cmpxchg_inatomic()
is implemented and always working. This removes a couple of runtime