diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-25 08:56:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-25 08:56:22 +0200 |
| commit | c0bb80cfa3c37fd92f066e328d83656067519a5f (patch) | |
| tree | fad29579615daaf7d36364e4b45702db0c709044 /tools/objtool/objtool.c | |
| parent | adfaf18334cbf16c563e4ebc67e968ea1b17ec51 (diff) | |
| parent | ecda85e70277ef24e44a1f6bc00243cebd19f985 (diff) | |
Merge branch 'x86/asm' into x86/apic
Pick up dependent changes to avoid merge conflicts
Diffstat (limited to 'tools/objtool/objtool.c')
| -rw-r--r-- | tools/objtool/objtool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c index ecc5b1b5d15d..31e0f9143840 100644 --- a/tools/objtool/objtool.c +++ b/tools/objtool/objtool.c @@ -42,10 +42,11 @@ struct cmd_struct { }; static const char objtool_usage_string[] = - "objtool [OPTIONS] COMMAND [ARGS]"; + "objtool COMMAND [ARGS]"; static struct cmd_struct objtool_cmds[] = { {"check", cmd_check, "Perform stack metadata validation on an object file" }, + {"orc", cmd_orc, "Generate in-place ORC unwind tables for an object file" }, }; bool help; |