Commit 2a130b7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.12' of... 

Merge tag 'kbuild-fixes-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Move non-boot built-in DTBs to the .rodata section

 - Fix Kconfig bugs

 - Fix maint scripts in the linux-image Debian package

 - Import some list macros to scripts/include/

* tag 'kbuild-fixes-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: deb-pkg: Remove blank first line from maint scripts
  kbuild: fix a typo dt_binding_schema -> dt_binding_schemas
  scripts: import more list macros
  kconfig: qconf: fix buffer overflow in debug links
  kconfig: qconf: move conf_read() before drawing tree pain
  kconfig: clear expr::val_is_valid when allocated
  kconfig: fix infinite loop in sym_calc_choice()
  kbuild: move non-boot built-in DTBs to .rodata section
parents c8d9f2c7 82cb4430

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,7 @@ help: 
		echo '* dtbs               - Build device tree blobs for enabled boards'; \

		echo '  dtbs_install       - Install dtbs to $(INSTALL_DTBS_PATH)'; \

		echo '  dt_binding_check   - Validate device tree binding documents and examples'; \

		echo '  dt_binding_schema  - Build processed device tree binding schemas'; \

		echo '  dt_binding_schemas - Build processed device tree binding schemas'; \

		echo '  dtbs_check         - Validate device tree source files';\

		echo '')

scripts/Makefile.dtbs

+3 −1
Original line number Diff line number Diff line
@@ -34,12 +34,14 @@ $(obj)/dtbs-list: $(dtb-y) FORCE 
# Assembly file to wrap dtb(o)

# ---------------------------------------------------------------------------



builtin-dtb-section = $(if $(filter arch/$(SRCARCH)/boot/dts%, $(obj)),.dtb.init.rodata,.rodata)



# Generate an assembly file to wrap the output of the device tree compiler

quiet_cmd_wrap_S_dtb = WRAP    $@

      cmd_wrap_S_dtb = {								\

		symbase=__$(patsubst .%,%,$(suffix $<))_$(subst -,_,$(notdir $*));	\

		echo '\#include <asm-generic/vmlinux.lds.h>';				\

		echo '.section .dtb.init.rodata,"a"';					\

		echo '.section $(builtin-dtb-section),"a"';				\

		echo '.balign STRUCT_ALIGNMENT';					\

		echo ".global $${symbase}_begin";					\

		echo "$${symbase}_begin:";						\

scripts/include/list.h

+50 −0
Original line number Diff line number Diff line
@@ -127,6 +127,36 @@ static inline void list_del(struct list_head *entry) 
	entry->prev = LIST_POISON2;

}



/**

 * list_replace - replace old entry by new one

 * @old : the element to be replaced

 * @new : the new element to insert

 *

 * If @old was empty, it will be overwritten.

 */

static inline void list_replace(struct list_head *old,

				struct list_head *new)

{

	new->next = old->next;

	new->next->prev = new;

	new->prev = old->prev;

	new->prev->next = new;

}



/**

 * list_replace_init - replace old entry by new one and initialize the old one

 * @old : the element to be replaced

 * @new : the new element to insert

 *

 * If @old was empty, it will be overwritten.

 */

static inline void list_replace_init(struct list_head *old,

				     struct list_head *new)

{

	list_replace(old, new);

	INIT_LIST_HEAD(old);

}



/**

 * list_move - delete from one list and add as another's head

 * @list: the entry to move
@@ -150,6 +180,26 @@ static inline void list_move_tail(struct list_head *list, 
	list_add_tail(list, head);

}



/**

 * list_is_first -- tests whether @list is the first entry in list @head

 * @list: the entry to test

 * @head: the head of the list

 */

static inline int list_is_first(const struct list_head *list, const struct list_head *head)

{

	return list->prev == head;

}



/**

 * list_is_last - tests whether @list is the last entry in list @head

 * @list: the entry to test

 * @head: the head of the list

 */

static inline int list_is_last(const struct list_head *list, const struct list_head *head)

{

	return list->next == head;

}



/**

 * list_is_head - tests whether @list is the list @head

 * @list: the entry to test

scripts/kconfig/expr.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static struct expr *expr_lookup(enum expr_type type, void *l, void *r) 
	e->type = type;

	e->left._initdata = l;

	e->right._initdata = r;

	e->val_is_valid = false;



	hash_add(expr_hashtable, &e->node, hash);

scripts/kconfig/parser.y

+8 −2
Original line number Diff line number Diff line
@@ -159,6 +159,12 @@ config_stmt: config_entry_start config_option_list 
			yynerrs++;

		}



		/*

		 * If the same symbol appears twice in a choice block, the list

		 * node would be added twice, leading to a broken linked list.

		 * list_empty() ensures that this symbol has not yet added.

		 */

		if (list_empty(&current_entry->sym->choice_link))

			list_add_tail(&current_entry->sym->choice_link,

				      &current_choice->choice_members);

	}