From patchwork Wed Oct 8 07:11:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: seungho1.park@lge.com X-Patchwork-Id: 38457 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C5CDD20DA7 for ; Wed, 8 Oct 2014 07:11:17 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id y10sf4849574wgg.6 for ; Wed, 08 Oct 2014 00:11:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=BUtdddoTgI9mlTS7aonDQOOgesHwyKg5wgaUEwCpD/Y=; b=RLXemg0hHEtnbqofL/Q69Cd5E2XhE9C1hV2kvFt0G44XLcpMQFlP4NIhjIxgQd6yT3 K6w1we/6YnsPxb5bbd7TUHyF3tQs3uD6Gg0JCUkbox6fXe/hvMTZmS35g8ZD7GH9oimB p6Yad2Maqv0AJxDzt6S36a5YuoM2Zs09qTAChQdzBdsTPIR0cxX0XQ/bYxvtzlssKAon juBRTcj6l9SjlbM4e1DzzIlsLpO1Izeccj/1MUUhhMLOylK+HVFa/HaHEwBYTFtgvZP1 yOfrbZrtCETidWhokaZ8T+42uEGyHKnMFq1xbZULqlCOLGtwo1HP3xyVVKgA9IRa90Mh pYMg== X-Gm-Message-State: ALoCoQlKdaoUgJoR/CABg7BTolGvIPJppJFmoZTGQiIrgYWlREv3/1yAHnMIrJDu8D7yWZyCUubh X-Received: by 10.152.26.225 with SMTP id o1mr154115lag.4.1412752276975; Wed, 08 Oct 2014 00:11:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.130 with SMTP id z2ls29191laa.61.gmail; Wed, 08 Oct 2014 00:11:16 -0700 (PDT) X-Received: by 10.152.20.98 with SMTP id m2mr9229505lae.51.1412752276767; Wed, 08 Oct 2014 00:11:16 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com [209.85.217.172]) by mx.google.com with ESMTPS id y2si31781300lae.49.2014.10.08.00.11.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Oct 2014 00:11:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id b6so7542629lbj.17 for ; Wed, 08 Oct 2014 00:11:16 -0700 (PDT) X-Received: by 10.112.50.10 with SMTP id y10mr8718345lbn.0.1412752276611; Wed, 08 Oct 2014 00:11:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp13866lbz; Wed, 8 Oct 2014 00:11:15 -0700 (PDT) X-Received: by 10.67.15.172 with SMTP id fp12mr8621258pad.4.1412752274514; Wed, 08 Oct 2014 00:11:14 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id az17si14757673pdb.198.2014.10.08.00.11.13 for ; Wed, 08 Oct 2014 00:11:14 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751191AbaJHHLM (ORCPT + 1 other); Wed, 8 Oct 2014 03:11:12 -0400 Received: from lgeamrelo01.lge.com ([156.147.1.125]:46383 "EHLO lgeamrelo01.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752640AbaJHHLL (ORCPT ); Wed, 8 Oct 2014 03:11:11 -0400 Received: from unknown (HELO localhost.localdomain) (10.177.226.38) by 156.147.1.125 with ESMTP; 8 Oct 2014 16:11:10 +0900 X-Original-SENDERIP: 10.177.226.38 X-Original-MAILFROM: seungho1.park@lge.com From: seungho1.park@lge.com To: seungho1.park@lge.com Cc: Josh Triplett , stable Subject: [PATCH 2/3] init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu Date: Wed, 8 Oct 2014 16:11:04 +0900 Message-Id: <1412752265-22198-3-git-send-email-seungho1.park@lge.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1412752265-22198-1-git-send-email-seungho1.park@lge.com> References: <1412752265-22198-1-git-send-email-seungho1.park@lge.com> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: seungho1.park@lge.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Josh Triplett 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 Cc: stable --- 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