From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Mike Galbraith <efault@gmx.de>, Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>,
Tom Zanussi <tzanussi@gmail.com>
Subject: [PATCH 1/5] perf tools: Make sure kptr_restrict warnings fit 80 col terms
Date: Fri, 27 May 2011 18:45:32 -0300 [thread overview]
Message-ID: <1306532736-3790-2-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1306532736-3790-1-git-send-email-acme@infradead.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
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 | 19 ++++++++-----------
tools/perf/builtin-report.c | 17 +++++++----------
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2ca107f..8e2c857 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)
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();
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 99156c3..287a173 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -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) {
--
1.6.2.5
next prev parent reply other threads:[~2011-05-27 21:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-27 21:45 [GIT PULL 0/5] perf/urgent fixes Arnaldo Carvalho de Melo
2011-05-27 21:45 ` Arnaldo Carvalho de Melo [this message]
2011-05-27 21:45 ` [PATCH 2/5] perf events: initialize fd array to -1 instead of 0 Arnaldo Carvalho de Melo
2011-05-27 21:45 ` [PATCH 3/5] perf top: Remove unused macro Arnaldo Carvalho de Melo
2011-05-27 21:45 ` [PATCH 4/5] perf top: Handle kptr_restrict Arnaldo Carvalho de Melo
2011-05-27 21:45 ` [PATCH 5/5] perf top: Don't stop if no kernel symtab is found Arnaldo Carvalho de Melo
2011-05-28 9:41 ` [GIT PULL 0/5] perf/urgent fixes Ingo Molnar
2011-05-29 14:12 ` Arnaldo Carvalho de Melo
2011-05-29 14:30 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306532736-3790-2-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=tzanussi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®