tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: fix oldnoconfig to do the right thing
kconfig: Temporarily disable dependency warnings
kconfig: delay symbol direct dependency initialization

Linus Torvalds 29979aa8 50c6dc9e

+5 -7
unified split
+1 -1
scripts/kconfig/conf.c
··· 427 if (sym->name && !sym_is_choice_value(sym)) { 428 printf("CONFIG_%s\n", sym->name); 429 } 430 - } else { 431 if (!conf_cnt++) 432 printf(_("*\n* Restart config...\n*\n")); 433 rootEntry = menu_get_parent_menu(menu);
··· 427 if (sym->name && !sym_is_choice_value(sym)) { 428 printf("CONFIG_%s\n", sym->name); 429 } 430 + } else if (input_mode != oldnoconfig) { 431 if (!conf_cnt++) 432 printf(_("*\n* Restart config...\n*\n")); 433 rootEntry = menu_get_parent_menu(menu);
-1
scripts/kconfig/expr.h
··· 165 struct symbol *sym; 166 struct property *prompt; 167 struct expr *dep; 168 - struct expr *dir_dep; 169 unsigned int flags; 170 char *help; 171 struct file *file;
··· 165 struct symbol *sym; 166 struct property *prompt; 167 struct expr *dep; 168 unsigned int flags; 169 char *help; 170 struct file *file;
+2 -5
scripts/kconfig/menu.c
··· 107 void menu_add_dep(struct expr *dep) 108 { 109 current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep)); 110 - current_entry->dir_dep = current_entry->dep; 111 } 112 113 void menu_set_type(int type) ··· 290 for (menu = parent->list; menu; menu = menu->next) 291 menu_finalize(menu); 292 } else if (sym) { 293 - /* ignore inherited dependencies for dir_dep */ 294 - sym->dir_dep.expr = expr_transform(expr_copy(parent->dir_dep)); 295 - sym->dir_dep.expr = expr_eliminate_dups(sym->dir_dep.expr); 296 - 297 basedep = parent->prompt ? parent->prompt->visible.expr : NULL; 298 basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no); 299 basedep = expr_eliminate_dups(expr_transform(basedep)); ··· 320 parent->next = last_menu->next; 321 last_menu->next = NULL; 322 } 323 } 324 for (menu = parent->list; menu; menu = menu->next) { 325 if (sym && sym_is_choice(sym) &&
··· 107 void menu_add_dep(struct expr *dep) 108 { 109 current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep)); 110 } 111 112 void menu_set_type(int type) ··· 291 for (menu = parent->list; menu; menu = menu->next) 292 menu_finalize(menu); 293 } else if (sym) { 294 basedep = parent->prompt ? parent->prompt->visible.expr : NULL; 295 basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no); 296 basedep = expr_eliminate_dups(expr_transform(basedep)); ··· 325 parent->next = last_menu->next; 326 last_menu->next = NULL; 327 } 328 + 329 + sym->dir_dep.expr = parent->dep; 330 } 331 for (menu = parent->list; menu; menu = menu->next) { 332 if (sym && sym_is_choice(sym) &&
+2
scripts/kconfig/symbol.c
··· 350 } 351 } 352 calc_newval: 353 if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) { 354 fprintf(stderr, "warning: ("); 355 expr_fprint(sym->rev_dep.expr, stderr); ··· 359 expr_fprint(sym->dir_dep.expr, stderr); 360 fprintf(stderr, ")\n"); 361 } 362 newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri); 363 } 364 if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
··· 350 } 351 } 352 calc_newval: 353 + #if 0 354 if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) { 355 fprintf(stderr, "warning: ("); 356 expr_fprint(sym->rev_dep.expr, stderr); ··· 358 expr_fprint(sym->dir_dep.expr, stderr); 359 fprintf(stderr, ")\n"); 360 } 361 + #endif 362 newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri); 363 } 364 if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)