Commit d864b7b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  kconfig: fix undesirable side effect of adding "visible" menu attribute
parents 3643e0e8 7ad12278

scripts/kconfig/menu.c

+14 −0
Original line number Diff line number Diff line
@@ -140,6 +140,20 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e 
		}

		if (current_entry->prompt && current_entry != &rootmenu)

			prop_warn(prop, "prompt redefined");



		/* Apply all upper menus' visibilities to actual prompts. */

		if(type == P_PROMPT) {

			struct menu *menu = current_entry;



			while ((menu = menu->parent) != NULL) {

				if (!menu->visibility)

					continue;

				prop->visible.expr

					= expr_alloc_and(prop->visible.expr,

							 menu->visibility);

			}

		}



		current_entry->prompt = prop;

	}

	prop->text = prompt;