From patchwork Thu Sep 30 19:23:17 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Naohiro Aota <naota@elisp.net>
X-Patchwork-Id: 221102
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8UJUMHb001888
	for <patchwork-kbuild@patchwork.kernel.org>;
	Thu, 30 Sep 2010 19:30:22 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751706Ab0I3TaV (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Thu, 30 Sep 2010 15:30:21 -0400
Received: from s318.xrea.com ([125.53.25.46]:34487 "HELO s318.xrea.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP
	id S1751578Ab0I3TaV (ORCPT <rfc822;linux-kbuild@vger.kernel.org>);
	Thu, 30 Sep 2010 15:30:21 -0400
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Thu, 30 Sep 2010 19:30:22 +0000 (UTC)
X-Greylist: delayed 400 seconds by postgrey-1.27 at vger.kernel.org;
	Thu, 30 Sep 2010 15:30:20 EDT
Received: (qmail 3884 invoked by uid 89); 1 Oct 2010 04:23:30 +0900
Received: from zaq3a55f429.zaq.ne.jp (HELO yue.localnetwork)
	(naota@elisp.net@58.85.244.41)
	by 192.168.52.118 with SMTP; 1 Oct 2010 04:23:30 +0900
From: Naohiro Aota <naota@elisp.net>
To: Roman Zippel <zippel@linux-m68k.org>, Arnaud Lacombe <lacombar@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
	linux-kbuild@vger.kernel.org, Michal Marek <mmarek@suse.cz>,
	Sam Ravnborg <sam@ravnborg.org>,
	Ulf Magnusson <ulfalizer.lkml@gmail.com>,
	=?iso-8859-1?Q?Uwe_Kleine-K=F6nig?= <u.kleine-koenig@pengutronix.de>,
	Naohiro Aota <naota@elisp.net>
Subject: [PATCH -next] kconfig: Don't go out from read config loop when you
	read new symbol
Date: Fri, 01 Oct 2010 04:23:17 +0900
Message-ID: <87sk0rghne.fsf@elisp.net>
User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/24.0.50 (gnu/linux)
MIME-Version: 1.0
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org


diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index f7d89d7..35c08ec 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -234,7 +234,7 @@ load:
 				sym = sym_find(line + 2 + strlen(CONFIG_));
 				if (!sym) {
 					sym_add_change_count(1);
-					break;
+					goto setsym;
 				}
 			} else {
 				sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
@@ -268,7 +268,7 @@ load:
 				sym = sym_find(line + strlen(CONFIG_));
 				if (!sym) {
 					sym_add_change_count(1);
-					break;
+					goto setsym;
 				}
 			} else {
 				sym = sym_lookup(line + strlen(CONFIG_), 0);
@@ -285,6 +285,7 @@ load:
 				conf_warning("unexpected data");
 			continue;
 		}
+setsym:
 		if (sym && sym_is_choice_value(sym)) {
 			struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
 			switch (sym->def[def].tri) {