diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-28 10:16:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-28 10:16:15 -0700 |
commit | 7ecb59a56666506ebb1197f89ca7d587bd83309e (patch) | |
tree | 81ad7f30114cd4f2ada4a5631636581f9ff7544e /tools/objtool/arch.h | |
parent | a358505d8af3ab43763e1b49549619528783d2bf (diff) | |
parent | 0f1441b44e823a74f3f3780902a113e07c73fbf6 (diff) | |
download | linux-7ecb59a56666506ebb1197f89ca7d587bd83309e.tar.bz2 |
Merge tag 'objtool_urgent_for_5.8_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fixes from Borislav Petkov:
"Three fixes from Peter Zijlstra suppressing KCOV instrumentation in
noinstr sections.
Peter Zijlstra says:
"Address KCOV vs noinstr. There is no function attribute to
selectively suppress KCOV instrumentation, instead teach objtool
to NOP out the calls in noinstr functions"
This cures a bunch of KCOV crashes (as used by syzcaller)"
* tag 'objtool_urgent_for_5.8_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Fix noinstr vs KCOV
objtool: Provide elf_write_{insn,reloc}()
objtool: Clean up elf_write() condition
Diffstat (limited to 'tools/objtool/arch.h')
-rw-r--r-- | tools/objtool/arch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/objtool/arch.h b/tools/objtool/arch.h index eda15a5a285e..3c5967748abb 100644 --- a/tools/objtool/arch.h +++ b/tools/objtool/arch.h @@ -84,4 +84,6 @@ unsigned long arch_jump_destination(struct instruction *insn); unsigned long arch_dest_rela_offset(int addend); +const char *arch_nop_insn(int len); + #endif /* _ARCH_H */ |