leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'objtool/urgent' into objtool/core

Browse Source 
Conflicts:
	tools/objtool/elf.c
	tools/objtool/elf.h
	tools/objtool/orc_gen.c
	tools/objtool/check.c

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
This commit is contained in:
Peter Zijlstra
2020-06-18 17:55:29 +02:00
parent 14bda4e529 0f1441b44e
commit d832c0051f
8 changed files with 120 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/objtool/orc_gen.c
View File

@@ -222,7 +222,7 @@ int create_orc_sections(struct objtool_file *file)
}
}
if (elf_rebuild_reloc_section(ip_relocsec))
if (elf_rebuild_reloc_section(file->elf, ip_relocsec))
return -1;
return 0;