* [PATCH -next] kconfig: Don't go out from read config loop when you read new symbol
@ 2010-09-30 19:23 Naohiro Aota
2010-09-30 20:02 ` Michal Marek
0 siblings, 1 reply; 2+ messages in thread
From: Naohiro Aota @ 2010-09-30 19:23 UTC (permalink / raw)
To: Roman Zippel, Arnaud Lacombe
Cc: linux-kernel, linux-next, linux-kbuild, Michal Marek,
Sam Ravnborg, Ulf Magnusson, Uwe Kleine-König, Naohiro Aota
commit 8baefd30b5b0101aa07aa75da44a9eee881eed28 of linux-next replaced
a `switch()' statement with some `if()' statements, but left `break's
in the `switch()' statement untouched. This cause read config loop to
exit and so "make oldconfig" is not much usable (see below).
> $ make oldconfig
><snip>
> scripts/kconfig/conf --oldconfig Kconfig
> #
> # using defaults found in /boot/config-2.6.34-ccs-r1
> #
> *
> * Restart config...
> *
> *
> * General setup
> *
> Prompt for development and/or incomplete code/drivers (EXPERIMENTAL) [N/y/?] (NEW)
(I've already have "CONFIG_EXPERIMENTAL=y" in the old config file. But
that's not read here.)
This patch should fix this problem.
Signed-off-by: Naohiro Aota <naota@elisp.net>
---
scripts/kconfig/confdata.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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) {
--
1.7.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] kconfig: Don't go out from read config loop when you read new symbol
2010-09-30 19:23 [PATCH -next] kconfig: Don't go out from read config loop when you read new symbol Naohiro Aota
@ 2010-09-30 20:02 ` Michal Marek
0 siblings, 0 replies; 2+ messages in thread
From: Michal Marek @ 2010-09-30 20:02 UTC (permalink / raw)
To: Naohiro Aota
Cc: Roman Zippel, Arnaud Lacombe, linux-kernel, linux-next,
linux-kbuild, Sam Ravnborg, Ulf Magnusson, Uwe Kleine-König
On Fri, Oct 01, 2010 at 04:23:17AM +0900, Naohiro Aota wrote:
> commit 8baefd30b5b0101aa07aa75da44a9eee881eed28 of linux-next replaced
> a `switch()' statement with some `if()' statements, but left `break's
> in the `switch()' statement untouched. This cause read config loop to
> exit and so "make oldconfig" is not much usable (see below).
Good catch, applied.
Michal
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-30 20:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-30 19:23 [PATCH -next] kconfig: Don't go out from read config loop when you read new symbol Naohiro Aota
2010-09-30 20:02 ` Michal Marek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).