]> git.baikalelectronics.ru Git - kernel.git/commit
init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu
authorJosh Triplett <josh@joshtriplett.org>
Fri, 3 Oct 2014 23:19:24 +0000 (16:19 -0700)
committerJosh Triplett <josh@joshtriplett.org>
Fri, 3 Oct 2014 23:49:43 +0000 (16:49 -0700)
commita620cbceb72b941f94bcc90f6e88b2cc0e736f83
tree65a5cec8dbe6f0589de546419d822b5c841b3965
parent216eab609160685874849402d1560a56c84d044b
init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu

commit 751edbec2d0099b63582a633c1bb91a6143f9670 ("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>
init/Kconfig