diff options
| author |   Naohiro Aota <naota@elisp.net> | 2010-10-01 04:23:17 +0900 |
|---|---|---|
| committer |   Michal Marek <mmarek@suse.cz> | 2010-09-30 21:59:32 +0200 |
| commit | 8bea7548ee0223175bea5fddcc54af93bd252d9b (patch) | |
| tree | 59bcfb7aeb795041bb9c8d34b80c767fd656230c /scripts/kconfig/confdata.c | |
| parent | Merge branch 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6 into kbuild/kconfig (diff) | |
| download | linux-dev-8bea7548ee0223175bea5fddcc54af93bd252d9b.tar.xz linux-dev-8bea7548ee0223175bea5fddcc54af93bd252d9b.zip | |
kconfig: Don't go out from read config loop when you read new symbol
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>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to '')
| -rw-r--r-- | 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 f7d89d7065b7..35c08ecaad17 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) { |