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

Merge tag 'mips-fixes_6.14_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fix from Thomas Bogendoerfer:
 "Fix fallout of /scripts/sorttable cleanup"

* tag 'mips-fixes_6.14_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Ignore relocs against __ex_table for relocatable kernel
parents ece144f1 6d48ad04

arch/mips/boot/tools/relocs.c

+5 −0
Original line number Diff line number Diff line
@@ -468,6 +468,8 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, 
			Elf_Sym *sym, const char *symname))

{

	int i;

	struct section *extab_sec = sec_lookup("__ex_table");

	int extab_index = extab_sec ? extab_sec - secs : -1;



	/* Walk through the relocations */

	for (i = 0; i < ehdr.e_shnum; i++) {
@@ -480,6 +482,9 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, 
		if (sec->shdr.sh_type != SHT_REL_TYPE)

			continue;



		if (sec->shdr.sh_info == extab_index)

			continue;



		sec_symtab  = sec->link;

		sec_applies = &secs[sec->shdr.sh_info];

		if (!(sec_applies->shdr.sh_flags & SHF_ALLOC))