| From 62b4d2041117f35ab2409c9f5c4b8d3dc8e59d0f Mon Sep 17 00:00:00 2001 |
| From: Josh Triplett <josh@joshtriplett.org> |
| Date: Fri, 3 Oct 2014 16:19:24 -0700 |
| Subject: init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu |
| |
| From: Josh Triplett <josh@joshtriplett.org> |
| |
| commit 62b4d2041117f35ab2409c9f5c4b8d3dc8e59d0f upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| init/Kconfig | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/init/Kconfig |
| +++ b/init/Kconfig |
| @@ -1432,6 +1432,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 |