From patchwork Fri Oct 3 23:31:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Triplett X-Patchwork-Id: 5029351 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 98241C11AB for ; Fri, 3 Oct 2014 23:32:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C312920219 for ; Fri, 3 Oct 2014 23:32:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0852200D9 for ; Fri, 3 Oct 2014 23:32:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760177AbaJCXcG (ORCPT ); Fri, 3 Oct 2014 19:32:06 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:38774 "EHLO relay6-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757374AbaJCXcB (ORCPT ); Fri, 3 Oct 2014 19:32:01 -0400 Received: from mfilter34-d.gandi.net (mfilter34-d.gandi.net [217.70.178.165]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id 55B56FB87D; Sat, 4 Oct 2014 01:31:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter34-d.gandi.net Received: from relay6-d.mail.gandi.net ([217.70.183.198]) by mfilter34-d.gandi.net (mfilter34-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id hn4fGhD3LyLj; Sat, 4 Oct 2014 01:31:58 +0200 (CEST) X-Originating-IP: 75.92.167.159 Received: from thin (75-92-167-159.war.clearwire-wmx.net [75.92.167.159]) (Authenticated sender: josh@joshtriplett.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 16A48FB88B; Sat, 4 Oct 2014 01:31:47 +0200 (CEST) Date: Fri, 3 Oct 2014 16:31:44 -0700 From: Josh Triplett To: "Yann E. MORIN" , Andrew Morton , Eric Paris , Michal Hocko , Matt Turner , Paul Gortmaker , =?utf-8?B?6JSh5q2j6b6Z?= , Tejun Heo , Fabian Frederick , "Luis R. Rodriguez" , Peter Foley , Konstantin Khlebnikov , "Eric W. Biederman" , "H. Peter Anvin" , Oleg Nesterov , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu Message-ID: <20141003233139.GA16079@thin> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Randy Dunlap --- Posting for review. I can upstream this through the tiny tree. Personally, I'd consider this a bit of a bug in Kconfig; ideally, Kconfig should only consider symbols with prompt strings when considering what to display in a menu. However, in the interim, this one-line patch drastically improves the usability of the "General Setup" config menu. init/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/init/Kconfig b/init/Kconfig index 31505a5..80a6907 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