From patchwork Fri Aug 6 23:19:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?= X-Patchwork-Id: 118098 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o76NJMpn031600 for ; Fri, 6 Aug 2010 23:19:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751980Ab0HFXTV (ORCPT ); Fri, 6 Aug 2010 19:19:21 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:41336 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751953Ab0HFXTU convert rfc822-to-8bit (ORCPT ); Fri, 6 Aug 2010 19:19:20 -0400 Received: by iwn33 with SMTP id 33so1701156iwn.19 for ; Fri, 06 Aug 2010 16:19:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.231.174.72 with SMTP id s8mr14557110ibz.41.1281136759864; Fri, 06 Aug 2010 16:19:19 -0700 (PDT) Received: by 10.231.200.138 with HTTP; Fri, 6 Aug 2010 16:19:19 -0700 (PDT) In-Reply-To: <20100804125156.GA23464@sepie.suse.cz> References: <20100804125156.GA23464@sepie.suse.cz> Date: Fri, 6 Aug 2010 16:19:19 -0700 Message-ID: Subject: Re: [GIT] kbuild: kconfig changes From: =?ISO-8859-1?Q?Arve_Hj=F8nnev=E5g?= To: Michal Marek Cc: Linus Torvalds , JBeulich@novell.com, aris@redhat.com, catalin.marinas@arm.com, jacmet@sunsite.dk, justinmattock@gmail.com, lizf@cn.fujitsu.com, sam@ravnborg.org, ulfalizer.lkml@gmail.com, zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 06 Aug 2010 23:19:22 +0000 (UTC) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index e95718f..1797226 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -261,18 +261,14 @@ struct symbol *sym_choice_default(struct symbol *sym) static struct symbol *sym_calc_choice(struct symbol *sym) { struct symbol *def_sym; - struct property *prop; - struct expr *e; - - /* first calculate all choice values' visibilities */ - prop = sym_get_choice_prop(sym); - expr_list_for_each_sym(prop->expr, e, def_sym) - sym_calc_visibility(def_sym); /* is the user choice visible? */ def_sym = sym->def[S_DEF_USER].val; - if (def_sym && def_sym->visible != no) - return def_sym; + if (def_sym) { + sym_calc_visibility(def_sym); + if (def_sym->visible != no) + return def_sym; + } def_sym = sym_choice_default(sym);