Merge branch 'linus' into perf/urgent, to pick up dependent commits

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c
index 31e0f9143840..07f329919828 100644
--- a/tools/objtool/objtool.c
+++ b/tools/objtool/objtool.c
@@ -70,7 +70,7 @@ static void cmd_usage(void)
 
         printf("\n");
 
-        exit(1);
+        exit(129);
 }
 
 static void handle_options(int *argc, const char ***argv)
@@ -86,9 +86,7 @@ static void handle_options(int *argc, const char ***argv)
                         break;
                 } else {
                         fprintf(stderr, "Unknown option: %s\n", cmd);
-                        fprintf(stderr, "\n Usage: %s\n",
-                                objtool_usage_string);
-                        exit(1);
+                        cmd_usage();
                 }
 
                 (*argv)++;