From patchwork Thu Oct 31 23:39:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Gouders X-Patchwork-Id: 3123531 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 7EC45BEEB2 for ; Fri, 1 Nov 2013 08:54:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A667420461 for ; Fri, 1 Nov 2013 08:54:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 620192045E for ; Fri, 1 Nov 2013 08:54:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752547Ab3KAIyg (ORCPT ); Fri, 1 Nov 2013 04:54:36 -0400 Received: from services.gouders.net ([141.101.32.176]:39519 "EHLO services.gouders.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752151Ab3KAIyf (ORCPT ); Fri, 1 Nov 2013 04:54:35 -0400 Received: from localhost (ip-109-44-3-144.web.vodafone.de [109.44.3.144]) (authenticated bits=0) by services.gouders.net (8.14.7/8.14.7) with ESMTP id rA18ridA030896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 1 Nov 2013 09:53:45 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gouders.net; s=gnet; t=1383296026; bh=80bFfpL/tvfuSjsyLzD29Q1HY4U5iNw2izMlKFJOcoY=; h=From:To:Cc:Subject:In-Reply-To:Date; b=EUu4lCBSb7ymYpeIapvr74xHRCx3T7DsH8zkKYKOlX1kH5BM0mzbwjrnRShwKMfiE 1/D+NBUciUCx4XWWZiCQrxR5OrFi4d5zgoFdaF6RBsZdewe0dff2sMP7gyDaiD0DdP 6Vhy7TGCUYH6WXYYYEbQbGGvqtF7Ocs9hm3TA+7U= From: Dirk Gouders To: "Yann E. MORIN" Cc: Sebastian Andrzej Siewior , Michal Marek , linux-kbuild@vger.kernel.org, Felipe Balbi , USB list , Tomi Valkeinen , Roger Quadros Subject: [PATCH v3] kconfig/symbol.c: handle choice_values that depend on 'm' symbols In-Reply-To: (Dirk Gouders's message of "Fri, 01 Nov 2013 09:45:33 +0100") Date: Fri, 1 Nov 2013 00:39:46 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) Message-ID: MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_ADSP_DISCARD, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 If choices consist of choice_values that depend on symbols set to 'm', those choice_values are not set to 'n' if the choice is changed from 'm' to 'y' (in which case only one active choice_value is allowed). Those values are also written to the config file causing modules to be built when they should not. The following config can be used to reproduce and examine the problem: config modules boolean modules default y option modules config dependency tristate "Dependency" default m choice prompt "Tristate Choice" default choice0 config choice0 tristate "Choice 0" config choice1 tristate "Choice 1" depends on dependency endchoice This patch sets choice_values' visibility that depend on symbols set to 'm' to 'n' if the corresponding choice is set to 'y'. This makes them disappear from the choice list and will also cause the choice_values' value set to 'n' in sym_calc_value() and as a result they are written as "not set" to the resulting .config file. Reported-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Gouders Tested-by: Sebastian Andrzej Siewior --- scripts/kconfig/symbol.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 22a3c40..32bbaa3 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -188,12 +188,23 @@ static void sym_validate_range(struct symbol *sym) static void sym_calc_visibility(struct symbol *sym) { struct property *prop; + struct symbol *choice_sym = NULL; tristate tri; /* any prompt visible? */ tri = no; + + if (sym_is_choice_value(sym)) + choice_sym = prop_get_symbol(sym_get_choice_prop(sym)); + for_all_prompts(sym, prop) { prop->visible.tri = expr_calc_value(prop->visible.expr); + /* + * choice_values with visibility 'mod' are not visible if the + * corresponding choice's value is 'yes'. + */ + if (prop->visible.tri == mod && (choice_sym && choice_sym->curr.tri == yes)) + prop->visible.tri = no; tri = EXPR_OR(tri, prop->visible.tri); } if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))