diff options
| author | Peter Zijlstra | 2020-06-18 17:55:29 +0200 |
|---|---|---|
| committer | Peter Zijlstra | 2020-06-18 17:55:29 +0200 |
| commit | d832c0051f4e9cc7d26ef3bc6e9b662bc6a90f3a (patch) | |
| tree | f7980a9c140174713b703851d06ed61283631e13 /tools/objtool/arch.h | |
| parent | 14bda4e5293ed9722f1dc39b543024e37707d6c6 (diff) | |
| parent | 0f1441b44e823a74f3f3780902a113e07c73fbf6 (diff) | |
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/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 d0969a9328c2..2e2ce089b0e9 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_reloc_offset(int addend); +const char *arch_nop_insn(int len); + #endif /* _ARCH_H */ |