lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2008-08-04 17:24:28 -07:00
parent 115a326c1e f072181e64
commit d8f4b819c3
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/kconfig/conf.c
View File

@@ -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);
} }

8
scripts/kconfig/confdata.c
View File

@@ -222,10 +222,8 @@ load:
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 @@ load:
} }
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)