Skip to content

Commit

Permalink
init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu
Browse files Browse the repository at this point in the history 
commit 03b8c7b ("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 <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Cc: stable <[email protected]>
  • Loading branch information
@joshtriplett
joshtriplett committed Oct 3, 2014
1 parent 361e9df commit 62b4d20
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions init/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 62b4d20

Please sign in to comment.