diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 10:15:59 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 10:15:59 -0800 |
commit | e72e58faa709d554f95431dbafd3374db5ed3fbb (patch) | |
tree | f73ee22c1f93a5e56d1930a29f82aae4f39aa956 /tools/objtool/arch.h | |
parent | 74e3f63ce60eb81fbd39aa6c0353059b7e2cb5f7 (diff) | |
parent | 4e4636cf981b5b629fbfb78aa9f232e015f7d521 (diff) | |
download | linux-stable-e72e58faa709d554f95431dbafd3374db5ed3fbb.tar.gz linux-stable-e72e58faa709d554f95431dbafd3374db5ed3fbb.tar.bz2 linux-stable-e72e58faa709d554f95431dbafd3374db5ed3fbb.zip |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fixes from Ingo Molnar:
"A handful of objtool fixes related to unreachable code, plus a build
fix for out of tree modules"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Enclose contents of unreachable() macro in a block
objtool: Prevent GCC from merging annotate_unreachable()
objtool: Improve detection of BUG() and other dead ends
objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules
Diffstat (limited to 'tools/objtool/arch.h')
-rw-r--r-- | tools/objtool/arch.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/objtool/arch.h b/tools/objtool/arch.h index f7350fcedc70..a59e061c0b4a 100644 --- a/tools/objtool/arch.h +++ b/tools/objtool/arch.h @@ -31,9 +31,8 @@ #define INSN_CALL_DYNAMIC 8 #define INSN_RETURN 9 #define INSN_CONTEXT_SWITCH 10 -#define INSN_BUG 11 -#define INSN_NOP 12 -#define INSN_OTHER 13 +#define INSN_NOP 11 +#define INSN_OTHER 12 #define INSN_LAST INSN_OTHER int arch_decode_instruction(struct elf *elf, struct section *sec, |