aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-05-27 10:00:41 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-05-27 15:02:09 -0400
commit646aaea615704010b5fd2c8c8891ff1a3a4b4f1a (patch)
treee7efc5b2a67f18f1ce3fb53ce70c299f1c74c6c8 /tools
parentd6a72fe465f4c54654a1d5488daeb820b4ecf275 (diff)
perf tools: Make sure kptr_restrict warnings fit 80 col terms
Suggested-by: Ingo Molnar <mingo@elte.hu> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Tom Zanussi <tzanussi@gmail.com> Link: http://lkml.kernel.org/n/tip-i1p8vrhq7xveyui6t1sc914e@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-record.c19
-rw-r--r--tools/perf/builtin-report.c17
2 files changed, 15 insertions, 21 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2ca107f3efdf..8e2c85798185 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -824,17 +824,14 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
824 symbol__init(); 824 symbol__init();
825 825
826 if (symbol_conf.kptr_restrict) 826 if (symbol_conf.kptr_restrict)
827 pr_warning("WARNING: Kernel address maps " 827 pr_warning(
828 "(/proc/{kallsyms,modules}) are restricted, " 828"WARNING: Kernel address maps (/proc/{kallsyms,modules}) are restricted,\n"
829 "check /proc/sys/kernel/kptr_restrict.\n\n" 829"check /proc/sys/kernel/kptr_restrict.\n\n"
830 "Samples in kernel functions may not be resolved " 830"Samples in kernel functions may not be resolved if a suitable vmlinux\n"
831 "if a suitable vmlinux file is not found in the " 831"file is not found in the buildid cache or in the vmlinux path.\n\n"
832 "buildid cache or in the vmlinux path.\n\n" 832"Samples in kernel modules won't be resolved at all.\n\n"
833 "Samples in kernel modules won't be resolved " 833"If some relocation was applied (e.g. kexec) symbols may be misresolved\n"
834 "at all.\n\n" 834"even with a suitable vmlinux or kallsyms file.\n\n");
835 "If some relocation was applied (e.g. kexec) "
836 "symbols may be misresolved even with a suitable "
837 "vmlinux or kallsyms file.\n\n");
838 835
839 if (no_buildid_cache || no_buildid) 836 if (no_buildid_cache || no_buildid)
840 disable_buildid_cache(); 837 disable_buildid_cache();
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 99156c35bc62..287a173523a7 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -281,17 +281,14 @@ static int __cmd_report(void)
281 kernel_kmap->ref_reloc_sym->addr == 0))) { 281 kernel_kmap->ref_reloc_sym->addr == 0))) {
282 const struct dso *kdso = kernel_map->dso; 282 const struct dso *kdso = kernel_map->dso;
283 283
284 ui__warning("Kernel address maps " 284 ui__warning(
285 "(/proc/{kallsyms,modules}) were restricted, " 285"Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n"
286 "check /proc/sys/kernel/kptr_restrict before " 286"Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n"
287 "running 'perf record'.\n\n%s\n\n" 287"Samples in kernel modules can't be resolved as well.\n\n",
288 "Samples in kernel modules can't be resolved "
289 "as well.\n\n",
290 RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION]) ? 288 RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION]) ?
291 "As no suitable kallsyms nor vmlinux was found, " 289"As no suitable kallsyms nor vmlinux was found, kernel samples\n"
292 "kernel samples can't be resolved." : 290"can't be resolved." :
293 "If some relocation was applied (e.g. kexec) " 291"If some relocation was applied (e.g. kexec) symbols may be misresolved.");
294 "symbols may be misresolved.");
295 } 292 }
296 293
297 if (dump_trace) { 294 if (dump_trace) {