Commit d8f4b819 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kconfig: drop the ""trying to assign nonexistent symbol" warning
  kconfig: always write out .config
parents 115a326c f072181e
...@@ -596,7 +596,7 @@ int main(int ac, char **av) ...@@ -596,7 +596,7 @@ int main(int ac, char **av)
break; break;
} }
if (conf_get_changed() && conf_write(NULL)) { if (conf_write(NULL)) {
fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
exit(1); exit(1);
} }
......
...@@ -222,10 +222,8 @@ int conf_read_simple(const char *name, int def) ...@@ -222,10 +222,8 @@ int conf_read_simple(const char *name, int def)
continue; continue;
if (def == S_DEF_USER) { if (def == S_DEF_USER) {
sym = sym_find(line + 9); sym = sym_find(line + 9);
if (!sym) { if (!sym)
conf_warning("trying to assign nonexistent symbol %s", line + 9);
break; break;
}
} else { } else {
sym = sym_lookup(line + 9, 0); sym = sym_lookup(line + 9, 0);
if (sym->type == S_UNKNOWN) if (sym->type == S_UNKNOWN)
...@@ -261,10 +259,8 @@ int conf_read_simple(const char *name, int def) ...@@ -261,10 +259,8 @@ int conf_read_simple(const char *name, int def)
} }
if (def == S_DEF_USER) { if (def == S_DEF_USER) {
sym = sym_find(line + 7); sym = sym_find(line + 7);
if (!sym) { if (!sym)
conf_warning("trying to assign nonexistent symbol %s", line + 7);
break; break;
}
} else { } else {
sym = sym_lookup(line + 7, 0); sym = sym_lookup(line + 7, 0);
if (sym->type == S_UNKNOWN) if (sym->type == S_UNKNOWN)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment