From patchwork Fri Apr 26 22:18:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 2496111 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 020AEDFF66 for ; Fri, 26 Apr 2013 22:18:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757256Ab3DZWSh (ORCPT ); Fri, 26 Apr 2013 18:18:37 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:50084 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756257Ab3DZWSf (ORCPT ); Fri, 26 Apr 2013 18:18:35 -0400 Received: by mail-we0-f169.google.com with SMTP id p43so4179656wea.28 for ; Fri, 26 Apr 2013 15:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references; bh=nxrDheDfOrFFqHJGi9VZKh9p+KSTkjhNtSDIhdL0p4o=; b=qpwAViVZELH7yGyHAOtqSp3Y6bKWVdpBSg4D9Coa3Cu0ohIqhTkb/mtQjiB2dl+IPd kIz2kkm9xdBkSEip14t3BMO7ZNBwQsAfr459RgIf+A9yO6Ocstf2Z6FwEPbOdjeh1NKZ 6onZZWSIBBRlLorlXOm5aKY5sf4IdSRGP7WibQu8hQT3568Vl+Zo6PDOz3+0ORzuCBwy +S+h3KpTIhUiAymFPvdqG7KWWzgkhFOHLdT3LGVCXIRB0TOdqxcx4CNlpTEfYi/SEj6R yDIhPl14t27E/HXlwmOSCOq+jkS2NqcFjMPXLH4O2exRBfzWZSIudhv6K6yDX0BdeiHD PMvA== X-Received: by 10.180.73.134 with SMTP id l6mr6680489wiv.4.1367014714067; Fri, 26 Apr 2013 15:18:34 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id ge7sm6753681wib.6.2013.04.26.15.18.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Apr 2013 15:18:33 -0700 (PDT) From: "Yann E. MORIN" To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sedat Dilek , Arnd Bergmann , Michal Marek , "Yann E. MORIN" , Sam Ravnborg , Stephen Rothwell , Thomas Petazzoni , Greg KH Subject: [PATCH 1/1] Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG" Date: Sat, 27 Apr 2013 00:18:00 +0200 Message-Id: <23a5dfdad22a574d19d7cc19b391f9ce0d3c2f21.1367014328.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: References: In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: "Yann E. MORIN" This reverts commit 422c809f03f043d0950d8362214818e956a9daee. It causes more harm than it solves issues. Reported-by: Sedat Dilek Reported-by: Arnd Bergmann Signed-off-by: "Yann E. MORIN" Tested-by: Sedat Dilek Cc: Sedat Dilek Cc: Arnd Bergmann Cc: Michal Marek Cc: Sam Ravnborg Cc: Stephen Rothwell Cc: Thomas Petazzoni Cc: Greg KH --- scripts/kconfig/confdata.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index fc45fc1..43eda40 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -288,6 +288,8 @@ load: for_all_symbols(i, sym) { sym->flags |= SYMBOL_CHANGED; sym->flags &= ~(def_flags|SYMBOL_VALID); + if (sym_is_choice(sym)) + sym->flags |= def_flags; switch (sym->type) { case S_INT: case S_HEX: @@ -377,13 +379,13 @@ setsym: case mod: if (cs->def[def].tri == yes) { conf_warning("%s creates inconsistent choice state", sym->name); + cs->flags &= ~def_flags; } break; case yes: if (cs->def[def].tri != no) conf_warning("override: %s changes choice state", sym->name); cs->def[def].val = sym; - cs->flags |= def_flags; break; } cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri); @@ -789,8 +791,6 @@ int conf_write(const char *name) sym_calc_value(sym); if (!(sym->flags & SYMBOL_WRITE)) goto next; - if (sym_is_choice_value(sym) && !menu_is_visible(menu->parent)) - goto next; sym->flags &= ~SYMBOL_WRITE; conf_write_symbol(out, sym, &kconfig_printer_cb, NULL); @@ -1077,7 +1077,6 @@ static void randomize_choice_values(struct symbol *csym) else { sym->def[S_DEF_USER].tri = no; } - sym->flags &= ~(SYMBOL_VALID); } csym->flags |= SYMBOL_DEF_USER; /* clear VALID to get value calculated */