diff options
| author |  Peter Zijlstra <peterz@infradead.org>
| 2020-06-18 17:55:29 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org>
| 2020-06-18 17:55:29 +0200 |
| commit | d832c0051f4e9cc7d26ef3bc6e9b662bc6a90f3a (patch) | |
| tree | f7980a9c140174713b703851d06ed61283631e13 /tools/objtool/orc_gen.c | |
| parent | Merge branch 'objtool/core' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | objtool: Fix noinstr vs KCOV (diff) | |
| download | linux-d832c0051f4e9cc7d26ef3bc6e9b662bc6a90f3a.tar.gz linux-d832c0051f4e9cc7d26ef3bc6e9b662bc6a90f3a.tar.bz2 linux-d832c0051f4e9cc7d26ef3bc6e9b662bc6a90f3a.zip | |
Merge branch 'objtool/urgent' into objtool/core
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>
Diffstat (limited to 'tools/objtool/orc_gen.c')
| -rw-r--r-- | tools/objtool/orc_gen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/objtool/orc_gen.c b/tools/objtool/orc_gen.c index 75e08cf0709b..968f55e6dd94 100644 --- a/tools/objtool/orc_gen.c +++ b/tools/objtool/orc_gen.c @@ -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; |