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

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
Ingo Molnar
2 parents b4f9f2b64a 0ef5bf1cd3
Showing 1 changed file Side-by-side Diff
Makefile
@@ -1290,6 +1290,7 @@
 	@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'
...	...	@@ -1290,6 +1290,7 @@
1290	1290	@echo ' make O=dir [targets] Locate all output files in "dir", including .config'
1291	1291	@echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'
1292	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	1294	@echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where'
1294	1295	@echo ' 1: warnings which may be relevant and do not occur too often'
1295	1296	@echo ' 2: warnings which occur quite often but may still be relevant'