Commit 2c95523c 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 

Pull kbuild fixes from Michal Marek:
 "There is one fix for a kbuild regression, plus three kconfig fixes for
  bugs that have alway been there, but are simple enough to be fixed in
  an -rc"

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig/menu.c: fix multiple references to expressions in menu_add_prop()
  mconf: handle keys in empty dialogs
  kbuild: Don't assume dts files live in arch/*/boot/dts
  scripts/config: fix assignment of parameters for short version of --*-after options
parents 4d3797d7 42a0940d

scripts/Makefile.lib

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb 
quiet_cmd_dtc = DTC     $@

cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \

	$(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \

		-i $(srctree)/arch/$(SRCARCH)/boot/dts $(DTC_FLAGS) \

		-i $(dir $<) $(DTC_FLAGS) \

		-d $(depfile).dtc $(dtc-tmp) ; \

	cat $(depfile).pre $(depfile).dtc > $(depfile)

scripts/config

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ while [ "$1" != "" ] ; do 
		;;

	--refresh)

		;;

	--*-after)

	--*-after|-E|-D|-M)

		checkarg "$1"

		A=$ARG

		checkarg "$2"

scripts/kconfig/lxdialog/menubox.c

+5 −4
Original line number Diff line number Diff line
@@ -303,10 +303,11 @@ do_resize: 
				}

		}



		if (i < max_choice ||

		if (item_count() != 0 &&

		    (i < max_choice ||

		     key == KEY_UP || key == KEY_DOWN ||

		     key == '-' || key == '+' ||

		    key == KEY_PPAGE || key == KEY_NPAGE) {

		     key == KEY_PPAGE || key == KEY_NPAGE)) {

			/* Remove highligt of current item */

			print_item(scroll + choice, choice, FALSE);

scripts/kconfig/mconf.c

+6 −5
Original line number Diff line number Diff line
@@ -670,11 +670,12 @@ static void conf(struct menu *menu, struct menu *active_menu) 
				  active_menu, &s_scroll);

		if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)

			break;

		if (item_count() != 0) {

			if (!item_activate_selected())

				continue;

			if (!item_tag())

				continue;



		}

		submenu = item_data();

		active_menu = item_data();

		if (submenu)

scripts/kconfig/menu.c

+14 −1
Original line number Diff line number Diff line
@@ -146,11 +146,24 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e 
			struct menu *menu = current_entry;



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

				struct expr *dup_expr;



				if (!menu->visibility)

					continue;

				/*

				 * Do not add a reference to the

				 * menu's visibility expression but

				 * use a copy of it.  Otherwise the

				 * expression reduction functions

				 * will modify expressions that have

				 * multiple references which can

				 * cause unwanted side effects.

				 */

				dup_expr = expr_copy(menu->visibility);



				prop->visible.expr

					= expr_alloc_and(prop->visible.expr,

							 menu->visibility);

							 dup_expr);

			}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE