From patchwork Tue Jun 25 21:37:44 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: 2781141 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 3B482C0AB1 for ; Tue, 25 Jun 2013 21:38:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 483182020D for ; Tue, 25 Jun 2013 21:37:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69F50201FC for ; Tue, 25 Jun 2013 21:37:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751498Ab3FYVh5 (ORCPT ); Tue, 25 Jun 2013 17:37:57 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:40232 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751694Ab3FYVh4 (ORCPT ); Tue, 25 Jun 2013 17:37:56 -0400 Received: by mail-wg0-f48.google.com with SMTP id f11so9758067wgh.15 for ; Tue, 25 Jun 2013 14:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=syQqLnwRnw3MCBaybml9ZwrfXsvYb+lVXob1wD9ddGo=; b=icVCssucnSDy3NhJLN2LwkeC0BicKx5g3lIIwtFKVab0Q7iGu5jqpTnMpl2W8d530R aCcZ/2MJ3v+2tX01xCDgNZ6GptkmU4faOsaX9iriZP+kl6pb62vRicvkPMdNne3FDa1B GRY6lbg3akG+BPo44+vaj/0473v0bscMpqYALo5QJmzUtqwUnS7WuonZsUr2F3l7KFhu 9bDeSSKl1STEXb+OQjZu8yxwjIpLuPgYkWwoB32pYAZ0No935i5IRTj0pE3ndtpbCmhb YDWtgfTRXHLzb7MgsfVg3nFMAys/ESPDDw/vdKhPAT8v6PsVnHdLjd6CyX33joMamNWb YuSA== X-Received: by 10.180.36.205 with SMTP id s13mr10507271wij.31.1372196275240; Tue, 25 Jun 2013 14:37:55 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id cw8sm6861464wib.7.2013.06.25.14.37.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 14:37:54 -0700 (PDT) From: "Yann E. MORIN" To: linux-kbuild@vger.kernel.org Cc: "Yann E. MORIN" , Michal Marek , Fengguang Wu , Sedat Dilek , Sam Ravnborg , Stephen Rothwell , Alexandre Bounine , Matt Porter Subject: [PATCH] Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG" Date: Tue, 25 Jun 2013 23:37:44 +0200 Message-Id: <1372196264-3407-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <20130625205836.GB14074@free.fr> References: <20130625205836.GB14074@free.fr> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,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 From: "Yann E. MORIN" This reverts commit 8357b48549e17b3e4e402c7f977b65708922e60f. It breaks more stuff than it fixes. Reported-by: Fengguang Wu Reported-by: Sedat Dilek Signed-off-by: "Yann E. MORIN" Cc: Michal Marek Cc: Fengguang Wu Cc: Sedat Dilek Cc: Sam Ravnborg Cc: Stephen Rothwell Cc: Alexandre Bounine Cc: Matt Porter --- Michal, here is the revert patch if you want it. Regards, Yann E. MORIN. --- scripts/kconfig/confdata.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 3e39208..c55c227 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);