From patchwork Wed Oct 8 07:13:57 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: 38459 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B24AC20447 for ; Wed, 8 Oct 2014 07:14:09 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id q1sf4870462lam.0 for ; Wed, 08 Oct 2014 00:14:08 -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=bf8A3uw/gjJEcJwHwF//bAvFvRRihfUKbq38fSt+zx4wWRtlp/LNyl7WjqnB+Ymf4/ BE2tNHkm51jgfw5I12qbNtSJ95wo4ByiiBzlOnztRNEolR38EByXAXXhN5OHbrrDLFFn Exc6YJCmfnOcL0az5c0nZSZjO4OhE2KVwLCuR7qhjlgYH/z5fbNHXzeNbzcvuf7oUWZq tP2h5XA6YeHajpXu8+OJuAv1BpTNsObCckYeInFojSwyZUCs9gIEsNxLp015ETTQWLaF JJPQUtv4AiB0riuVRY2UfuF1aUDZ+Ojq0a/MeuQPUssn9/vyJVLcnhduLLccMaMbz5XD cpBw== X-Gm-Message-State: ALoCoQnNChb/p43KgSgXmaRFZ6Q1OxG9VMNWzQqc6Br+JOc6i0Bk/wLMocAdSj7CVwvS3xZrrVks X-Received: by 10.112.60.225 with SMTP id k1mr1302958lbr.0.1412752448598; Wed, 08 Oct 2014 00:14:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.132 with SMTP id ay4ls25148lab.46.gmail; Wed, 08 Oct 2014 00:14:08 -0700 (PDT) X-Received: by 10.112.144.228 with SMTP id sp4mr8967581lbb.54.1412752448456; Wed, 08 Oct 2014 00:14:08 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by mx.google.com with ESMTPS id p3si21870595laj.14.2014.10.08.00.14.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Oct 2014 00:14:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id n15so438300lbi.39 for ; Wed, 08 Oct 2014 00:14:08 -0700 (PDT) X-Received: by 10.112.164.71 with SMTP id yo7mr8876232lbb.73.1412752448327; Wed, 08 Oct 2014 00:14:08 -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 c5csp14190lbz; Wed, 8 Oct 2014 00:14:07 -0700 (PDT) X-Received: by 10.68.57.168 with SMTP id j8mr8383583pbq.106.1412752446586; Wed, 08 Oct 2014 00:14:06 -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.14.05 for ; Wed, 08 Oct 2014 00:14:06 -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 S1751191AbaJHHOF (ORCPT + 1 other); Wed, 8 Oct 2014 03:14:05 -0400 Received: from lgeamrelo02.lge.com ([156.147.1.126]:46119 "EHLO lgeamrelo02.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753895AbaJHHOE (ORCPT ); Wed, 8 Oct 2014 03:14:04 -0400 Received: from unknown (HELO localhost.localdomain) (10.177.226.38) by 156.147.1.126 with ESMTP; 8 Oct 2014 16:13:46 +0900 X-Original-SENDERIP: 10.177.226.38 X-Original-MAILFROM: seungho1.park@lge.com From: seungho1.park@lge.com To: vanilla@blackduck.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:13:57 +0900 Message-Id: <1412752438-22812-3-git-send-email-seungho1.park@lge.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1412752438-22812-1-git-send-email-seungho1.park@lge.com> References: <1412752438-22812-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.180 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