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

Merge tag 'kbuild-fixes-v6.13-2' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - Remove stale code in usr/include/headers_check.pl

 - Fix issues in the user-mode-linux Debian package

 - Fix false-positive "export twice" errors in modpost

* tag 'kbuild-fixes-v6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  modpost: distinguish same module paths from different dump files
  kbuild: deb-pkg: Do not install maint scripts for arch 'um'
  kbuild: deb-pkg: add debarch for ARCH=um
  kbuild: Drop support for include/asm-<arch> in headers_check.pl
parents 9c707ba9 9435dc77

scripts/mod/modpost.c

+9 −8
Original line number Diff line number Diff line
@@ -155,12 +155,13 @@ char *get_line(char **stringp) 
/* A list of all modules we processed */

LIST_HEAD(modules);



static struct module *find_module(const char *modname)

static struct module *find_module(const char *filename, const char *modname)

{

	struct module *mod;



	list_for_each_entry(mod, &modules, list) {

		if (strcmp(mod->name, modname) == 0)

		if (!strcmp(mod->dump_file, filename) &&

		    !strcmp(mod->name, modname))

			return mod;

	}

	return NULL;
@@ -2030,10 +2031,10 @@ static void read_dump(const char *fname) 
			continue;

		}



		mod = find_module(modname);

		mod = find_module(fname, modname);

		if (!mod) {

			mod = new_module(modname, strlen(modname));

			mod->from_dump = true;

			mod->dump_file = fname;

		}

		s = sym_add_exported(symname, mod, gpl_only, namespace);

		sym_set_crc(s, crc);
@@ -2052,7 +2053,7 @@ static void write_dump(const char *fname) 
	struct symbol *sym;



	list_for_each_entry(mod, &modules, list) {

		if (mod->from_dump)

		if (mod->dump_file)

			continue;

		list_for_each_entry(sym, &mod->exported_symbols, list) {

			if (trim_unused_exports && !sym->used)
@@ -2076,7 +2077,7 @@ static void write_namespace_deps_files(const char *fname) 


	list_for_each_entry(mod, &modules, list) {



		if (mod->from_dump || list_empty(&mod->missing_namespaces))

		if (mod->dump_file || list_empty(&mod->missing_namespaces))

			continue;



		buf_printf(&ns_deps_buf, "%s.ko:", mod->name);
@@ -2194,7 +2195,7 @@ int main(int argc, char **argv) 
		read_symbols_from_files(files_source);



	list_for_each_entry(mod, &modules, list) {

		if (mod->from_dump || mod->is_vmlinux)

		if (mod->dump_file || mod->is_vmlinux)

			continue;



		check_modname_len(mod);
@@ -2205,7 +2206,7 @@ int main(int argc, char **argv) 
		handle_white_list_exports(unused_exports_white_list);



	list_for_each_entry(mod, &modules, list) {

		if (mod->from_dump)

		if (mod->dump_file)

			continue;



		if (mod->is_vmlinux)

scripts/mod/modpost.h

+2 −1
Original line number Diff line number Diff line
@@ -95,14 +95,15 @@ struct module_alias { 
/**

 * struct module - represent a module (vmlinux or *.ko)

 *

 * @dump_file: path to the .symvers file if loaded from a file

 * @aliases: list head for module_aliases

 */

struct module {

	struct list_head list;

	struct list_head exported_symbols;

	struct list_head unresolved_symbols;

	const char *dump_file;

	bool is_gpl_compatible;

	bool from_dump;		/* true if module was loaded from *.symvers */

	bool is_vmlinux;

	bool seen;

	bool has_init;

scripts/package/builddeb

+6 −0
Original line number Diff line number Diff line
@@ -63,6 +63,12 @@ install_linux_image () { 
	esac

	cp "$(${MAKE} -s -f ${srctree}/Makefile image_name)" "${pdir}/${installed_image_path}"



	if [ "${ARCH}" != um ]; then

		install_maint_scripts "${pdir}"

	fi

}



install_maint_scripts () {

	# Install the maintainer scripts

	# Note: hook scripts under /etc/kernel are also executed by official Debian

	# kernel packages, as well as kernel packages built using make-kpkg.

scripts/package/mkdebian

+7 −0
Original line number Diff line number Diff line
@@ -70,6 +70,13 @@ set_debarch() { 
			debarch=sh4$(if_enabled_echo CONFIG_CPU_BIG_ENDIAN eb)

		fi

		;;

	um)

		if is_enabled CONFIG_64BIT; then

			debarch=amd64

		else

			debarch=i386

		fi

		;;

	esac

	if [ -z "$debarch" ]; then

		debarch=$(dpkg-architecture -qDEB_HOST_ARCH)

usr/include/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ quiet_cmd_hdrtest = HDRTEST $< 
      cmd_hdrtest = \

		$(CC) $(c_flags) -fsyntax-only -x c /dev/null \

			$(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \

		$(PERL) $(src)/headers_check.pl $(obj) $(SRCARCH) $<; \

		$(PERL) $(src)/headers_check.pl $(obj) $<; \

		touch $@



$(obj)/%.hdrtest: $(obj)/%.h FORCE