Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d634ca3 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 build system failure fix from Michal Marek:
 "This fixes build failure with newer gcc that adds some internal
  symbols that end in "__mod_*_device_table", but are not actually the
  tables themselves."

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Fix modpost failures in fedora 17
parents d2da626d e88aa7bb

scripts/mod/file2alias.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1100,6 +1100,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, 
	if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)

	if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)

		return;

		return;





	/* We're looking for an object */

	if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)

		return;



	/* All our symbols are of form <prefix>__mod_XXX_device_table. */

	/* All our symbols are of form <prefix>__mod_XXX_device_table. */

	name = strstr(symname, "__mod_");

	name = strstr(symname, "__mod_");

	if (!name)

	if (!name)