perf tools: Make sure kptr_restrict warnings fit 80 col terms
Arnaldo Carvalho de Melo [Fri, 27 May 2011 14:00:41 +0000 (11:00 -0300)]
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>

tools/perf/builtin-record.c
tools/perf/builtin-report.c

index 2ca107f..8e2c857 100644 (file)
@@ -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();
index 99156c3..287a173 100644 (file)
@@ -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) {