summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-06-16 13:26:23 +0200
committerIngo Molnar <mingo@elte.hu>2011-06-16 13:26:23 +0200
commitaf07ce3e77d3b24ab1d71fcc5833d41800f23b2b (patch)
treef464a6df26e0b62ba23c22de954cd58fb9a59aaa
parentb4f9f2b64aa189c5584f266f4f0343af7a705441 (diff)
parent0ef5bf1cd3bd2e3eacb11fca80efe3674927ed1a (diff)
downloadlinux-3.10-af07ce3e77d3b24ab1d71fcc5833d41800f23b2b.tar.gz
linux-3.10-af07ce3e77d3b24ab1d71fcc5833d41800f23b2b.tar.bz2
linux-3.10-af07ce3e77d3b24ab1d71fcc5833d41800f23b2b.zip
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Conflicts: Makefile
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index badb9239e2b..cb6bdab8947 100644
--- a/Makefile
+++ b/Makefile
@@ -1290,6 +1290,7 @@ help:
@echo ' make O=dir [targets] Locate all output files in "dir", including .config'
@echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'
@echo ' make C=2 [targets] Force check of all c source with $$CHECK'
+ @echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
@echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where'
@echo ' 1: warnings which may be relevant and do not occur too often'
@echo ' 2: warnings which occur quite often but may still be relevant'