aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/perf_counter/builtin-help.c10
-rw-r--r--Documentation/perf_counter/command-list.txt14
-rw-r--r--Documentation/perf_counter/perf.c4
-rw-r--r--Documentation/perf_counter/util/parse-options.c2
-rw-r--r--Documentation/perf_counter/util/usage.c2
5 files changed, 17 insertions, 15 deletions
diff --git a/Documentation/perf_counter/builtin-help.c b/Documentation/perf_counter/builtin-help.c
index a3894bfb9b6e..0f32dc3f3c4c 100644
--- a/Documentation/perf_counter/builtin-help.c
+++ b/Documentation/perf_counter/builtin-help.c
@@ -284,7 +284,7 @@ void list_common_cmds_help(void)
284 longest = strlen(common_cmds[i].name); 284 longest = strlen(common_cmds[i].name);
285 } 285 }
286 286
287 puts("The most commonly used perf commands are:"); 287 puts(" The most commonly used perf commands are:");
288 for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { 288 for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
289 printf(" %s ", common_cmds[i].name); 289 printf(" %s ", common_cmds[i].name);
290 mput_char(' ', longest - strlen(common_cmds[i].name)); 290 mput_char(' ', longest - strlen(common_cmds[i].name));
@@ -426,16 +426,16 @@ int cmd_help(int argc, const char **argv, const char *prefix)
426 builtin_help_usage, 0); 426 builtin_help_usage, 0);
427 427
428 if (show_all) { 428 if (show_all) {
429 printf("usage: %s\n\n", perf_usage_string); 429 printf("\n usage: %s\n\n", perf_usage_string);
430 list_commands("perf commands", &main_cmds, &other_cmds); 430 list_commands("perf commands", &main_cmds, &other_cmds);
431 printf("%s\n", perf_more_info_string); 431 printf(" %s\n\n", perf_more_info_string);
432 return 0; 432 return 0;
433 } 433 }
434 434
435 if (!argv[0]) { 435 if (!argv[0]) {
436 printf("usage: %s\n\n", perf_usage_string); 436 printf("\n usage: %s\n\n", perf_usage_string);
437 list_common_cmds_help(); 437 list_common_cmds_help();
438 printf("\n%s\n", perf_more_info_string); 438 printf("\n %s\n\n", perf_more_info_string);
439 return 0; 439 return 0;
440 } 440 }
441 441
diff --git a/Documentation/perf_counter/command-list.txt b/Documentation/perf_counter/command-list.txt
index 439029207770..f0b922c90234 100644
--- a/Documentation/perf_counter/command-list.txt
+++ b/Documentation/perf_counter/command-list.txt
@@ -1,7 +1,9 @@
1#
1# List of known perf commands. 2# List of known perf commands.
2# command name category [deprecated] [common] 3# command name category [deprecated] [common]
3perf-record mainporcelain common 4#
4perf-report mainporcelain common 5perf-record mainporcelain common
5perf-stat mainporcelain common 6perf-report mainporcelain common
6perf-top mainporcelain common 7perf-stat mainporcelain common
7 8perf-top mainporcelain common
9perf-list mainporcelain common
diff --git a/Documentation/perf_counter/perf.c b/Documentation/perf_counter/perf.c
index 9ac75657a180..161824f1241f 100644
--- a/Documentation/perf_counter/perf.c
+++ b/Documentation/perf_counter/perf.c
@@ -384,9 +384,9 @@ int main(int argc, const char **argv)
384 argv[0] += 2; 384 argv[0] += 2;
385 } else { 385 } else {
386 /* The user didn't specify a command; give them help */ 386 /* The user didn't specify a command; give them help */
387 printf("usage: %s\n\n", perf_usage_string); 387 printf("\n usage: %s\n\n", perf_usage_string);
388 list_common_cmds_help(); 388 list_common_cmds_help();
389 printf("\n%s\n", perf_more_info_string); 389 printf("\n %s\n\n", perf_more_info_string);
390 exit(1); 390 exit(1);
391 } 391 }
392 cmd = argv[0]; 392 cmd = argv[0];
diff --git a/Documentation/perf_counter/util/parse-options.c b/Documentation/perf_counter/util/parse-options.c
index 551b6bc34e79..e4d353395a60 100644
--- a/Documentation/perf_counter/util/parse-options.c
+++ b/Documentation/perf_counter/util/parse-options.c
@@ -385,7 +385,7 @@ int usage_with_options_internal(const char * const *usagestr,
385 if (!usagestr) 385 if (!usagestr)
386 return PARSE_OPT_HELP; 386 return PARSE_OPT_HELP;
387 387
388 fprintf(stderr, "usage: %s\n", *usagestr++); 388 fprintf(stderr, "\n usage: %s\n", *usagestr++);
389 while (*usagestr && **usagestr) 389 while (*usagestr && **usagestr)
390 fprintf(stderr, " or: %s\n", *usagestr++); 390 fprintf(stderr, " or: %s\n", *usagestr++);
391 while (*usagestr) { 391 while (*usagestr) {
diff --git a/Documentation/perf_counter/util/usage.c b/Documentation/perf_counter/util/usage.c
index 7a10421fe6b4..2cad286e4371 100644
--- a/Documentation/perf_counter/util/usage.c
+++ b/Documentation/perf_counter/util/usage.c
@@ -14,7 +14,7 @@ static void report(const char *prefix, const char *err, va_list params)
14 14
15static NORETURN void usage_builtin(const char *err) 15static NORETURN void usage_builtin(const char *err)
16{ 16{
17 fprintf(stderr, "usage: %s\n", err); 17 fprintf(stderr, "\n usage: %s\n", err);
18 exit(129); 18 exit(129);
19} 19}
20 20