aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-06-16 07:26:23 -0400
committerIngo Molnar <mingo@elte.hu>2011-06-16 07:26:23 -0400
commitaf07ce3e77d3b24ab1d71fcc5833d41800f23b2b (patch)
treef464a6df26e0b62ba23c22de954cd58fb9a59aaa /Makefile
parentb4f9f2b64aa189c5584f266f4f0343af7a705441 (diff)
parent0ef5bf1cd3bd2e3eacb11fca80efe3674927ed1a (diff)
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index badb9239e2bb..cb6bdab8947b 100644
--- a/Makefile
+++ b/Makefile
@@ -1290,6 +1290,7 @@ help:
1290 @echo ' make O=dir [targets] Locate all output files in "dir", including .config' 1290 @echo ' make O=dir [targets] Locate all output files in "dir", including .config'
1291 @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)' 1291 @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'
1292 @echo ' make C=2 [targets] Force check of all c source with $$CHECK' 1292 @echo ' make C=2 [targets] Force check of all c source with $$CHECK'
1293 @echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
1293 @echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where' 1294 @echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where'
1294 @echo ' 1: warnings which may be relevant and do not occur too often' 1295 @echo ' 1: warnings which may be relevant and do not occur too often'
1295 @echo ' 2: warnings which occur quite often but may still be relevant' 1296 @echo ' 2: warnings which occur quite often but may still be relevant'