From patchwork Thu Nov 7 14:05:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Gouders X-Patchwork-Id: 3152901 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C562C9F461 for ; Thu, 7 Nov 2013 14:05:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83F6F204D2 for ; Thu, 7 Nov 2013 14:05:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 194D2204D1 for ; Thu, 7 Nov 2013 14:05:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754369Ab3KGOFQ (ORCPT ); Thu, 7 Nov 2013 09:05:16 -0500 Received: from services.gouders.net ([141.101.32.176]:47327 "EHLO services.gouders.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754325Ab3KGOFM (ORCPT ); Thu, 7 Nov 2013 09:05:12 -0500 Received: from localhost ([193.175.199.229]) (authenticated bits=0) by services.gouders.net (8.14.7/8.14.7) with ESMTP id rA7E4Ium027681 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 7 Nov 2013 15:04:18 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gouders.net; s=gnet; t=1383833059; bh=V634PMyOsWVV3MJeu5J4ocweb0VDdW4dECK+S3RzMkk=; h=From:To:Cc:Subject:In-Reply-To:Date; b=Nap4Mmche/0Cbur2BKDbE6mURJzQ/xblYY37ecqSJOLWAjEtLfFeBcPfYoLC1VqVm JbZC/Vthx0a+Ph8Zm4+huksLfaRLBFYuOHVM2w8fkxE56/sVroYfOkI7eLkJipu0Hm wm7iZ2/KrzGLgAdWI7jjOTBA20PbpYHDjf3DpOdY= 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 v4] kconfig/symbol.c: handle choice_values that depend on 'm' symbols In-Reply-To: (Dirk Gouders's message of "Thu, 07 Nov 2013 15:02:01 +0100") Date: Thu, 07 Nov 2013 15:05:29 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) 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=-5.0 required=5.0 tests=BAYES_00, 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; with the frontend of your choice set "Choice 0" and "Choice 1" to 'm', then set "Tristate Choice" to 'y' and save the configuration: 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 Acked-by: "Yann E. MORIN" --- scripts/kconfig/symbol.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index c9a6775..06d96c9 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -189,12 +189,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))