perf tools: Make sure kptr_restrict warnings fit 80 col terms
Commit-ID: 646aaea615704010b5fd2c8c8891ff1a3a4b4f1a Gitweb: http://git.kernel.org/tip/646aaea615704010b5fd2c8c8891ff1a3a4b4f1a Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 27 May 2011 11:00:41 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 27 May 2011 16:02:09 -0300
perf tools: Make sure kptr_restrict warnings fit 80 col terms
Suggested-by Ingo Molnar <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Tom Zanussi <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-record.c | 19 ++++++++----------- tools/perf/builtin-report.c | 17 +++++++---------- 2 files changed, 15 insertions(+), 21 deletions(-)
tools/perf/builtin-record.c +8 -11
@@ -824,17 +824,14 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)symbol__init ();if (symbol_conf.kptr_restrict) -pr_warning ("WARNING: Kernel address maps " -"(/proc/{kallsyms,modules}) are restricted, " -"check /proc/sys/kernel/kptr_restrict.\n\n" -"Samples in kernel functions may not be resolved " -"if a suitable vmlinux file is not found in the " -"buildid cache or in the vmlinux path.\n\n" -"Samples in kernel modules won't be resolved " -"at all.\n\n" -"If some relocation was applied (e.g. kexec) " -"symbols may be misresolved even with a suitable " -"vmlinux or kallsyms file.\n\n" ); +pr_warning ( +"WARNING: Kernel address maps (/proc/{kallsyms,modules}) are restricted,\n" +"check /proc/sys/kernel/kptr_restrict.\n\n" +"Samples in kernel functions may not be resolved if a suitable vmlinux\n" +"file is not found in the buildid cache or in the vmlinux path.\n\n" +"Samples in kernel modules won't be resolved at all.\n\n" +"If some relocation was applied (e.g. kexec) symbols may be misresolved\n" +"even with a suitable vmlinux or kallsyms file.\n\n" );if (no_buildid_cache || no_buildid)disable_buildid_cache ();
tools/perf/builtin-report.c +7 -10
@@ -281,17 +281,14 @@ static int __cmd_report(void) kernel_kmap->ref_reloc_sym->addr == 0))) {const struct dso *kdso = kernel_map->dso; -ui__warning ("Kernel address maps " -"(/proc/{kallsyms,modules}) were restricted, " -"check /proc/sys/kernel/kptr_restrict before " -"running 'perf record'.\n\n%s\n\n" -"Samples in kernel modules can't be resolved " -"as well.\n\n" , +ui__warning ( +"Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n" +"Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n" +"Samples in kernel modules can't be resolved as well.\n\n" ,RB_EMPTY_ROOT (&kdso->symbols[MAP__FUNCTION ]) ? -"As no suitable kallsyms nor vmlinux was found, " -"kernel samples can't be resolved." : -"If some relocation was applied (e.g. kexec) " -"symbols may be misresolved." ); +"As no suitable kallsyms nor vmlinux was found, kernel samples\n" +"can't be resolved." : +"If some relocation was applied (e.g. kexec) symbols may be misresolved." ); }if (dump_trace) {