Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit becf6c97 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/core' of... 

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
parents 6113e45f bafb6747

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ endif 
no-dot-config-targets := clean mrproper distclean \

			 cscope TAGS tags help %docs check% \

			 include/linux/version.h headers_% \

			 kernelrelease kernelversion

			 kernelrelease kernelversion %src-pkg



config-targets := 0

mixed-targets  := 0
@@ -1215,6 +1215,8 @@ distclean: mrproper 
# rpm target kept for backward compatibility

package-dir	:= $(srctree)/scripts/package



%src-pkg: FORCE

	$(Q)$(MAKE) $(build)=$(package-dir) $@

%pkg: include/config/kernel.release FORCE

	$(Q)$(MAKE) $(build)=$(package-dir) $@

rpm: include/config/kernel.release FORCE

scripts/package/Makefile

+31 −6
Original line number Diff line number Diff line
@@ -111,6 +111,28 @@ tar%pkg: FORCE 
clean-dirs += $(objtree)/tar-install/





# perf-pkg - generate a source tarball with perf source

# ---------------------------------------------------------------------------



perf-tar=perf-$(KERNELVERSION)



quiet_cmd_perf_tar = TAR

      cmd_perf_tar = \

git archive --prefix=$(perf-tar)/ HEAD^{tree}                       \

	$$(cat $(srctree)/tools/perf/MANIFEST) -o $(perf-tar).tar;  \

mkdir -p $(perf-tar);                                               \

git rev-parse HEAD > $(perf-tar)/HEAD;                              \

tar rf $(perf-tar).tar $(perf-tar)/HEAD;                            \

rm -r $(perf-tar);                                                  \

$(if $(findstring tar-src,$@),,                                     \

$(if $(findstring bz2,$@),bzip2,                                    \

$(if $(findstring gz,$@),gzip,                                      \

$(error unknown target $@)))                                       \

	-f -9 $(perf-tar).tar)



perf-%pkg: FORCE

	$(call cmd,perf_tar)



# Help text displayed when executing 'make help'

# ---------------------------------------------------------------------------

help: FORCE
@@ -120,4 +142,7 @@ help: FORCE 
	@echo '  tar-pkg             - Build the kernel as an uncompressed tarball'

	@echo '  targz-pkg           - Build the kernel as a gzip compressed tarball'

	@echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'

	@echo '  perf-tar-src-pkg    - Build $(perf-tar).tar source tarball'

	@echo '  perf-targz-src-pkg  - Build $(perf-tar).tar.gz source tarball'

	@echo '  perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'

tools/perf/Documentation/perf-record.txt

+7 −0
Original line number Diff line number Diff line
@@ -103,6 +103,13 @@ OPTIONS 
--raw-samples::

Collect raw sample records from all opened counters (default for tracepoint counters).



-C::

--cpu::

Collect samples only on the list of cpus provided. Multiple CPUs can be provided as a

comma-sperated list with no space: 0,1. Ranges of CPUs are specified with -: 0-2.

In per-thread mode with inheritance mode on (default), samples are captured only when

the thread executes on the designated CPUs. Default is to monitor all CPUs.



SEE ALSO

--------

linkperf:perf-stat[1], linkperf:perf-list[1]

tools/perf/Documentation/perf-stat.txt

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ OPTIONS 
-B::

        print large numbers with thousands' separators according to locale



-C::

--cpu=::

Count only on the list of cpus provided. Multiple CPUs can be provided as a

comma-sperated list with no space: 0,1. Ranges of CPUs are specified with -: 0-2.

In per-thread mode, this option is ignored. The -a option is still necessary

to activate system-wide monitoring. Default is to count on all CPUs.



EXAMPLES

--------

tools/perf/Documentation/perf-top.txt

+5 −3
Original line number Diff line number Diff line
@@ -25,9 +25,11 @@ OPTIONS 
--count=<count>::

	Event period to sample.



-C <cpu>::

--CPU=<cpu>::

	CPU to profile.

-C <cpu-list>::

--cpu=<cpu>::

Monitor only on the list of cpus provided. Multiple CPUs can be provided as a

comma-sperated list with no space: 0,1. Ranges of CPUs are specified with -: 0-2.

Default is to monitor all CPUS.



-d <seconds>::

--delay=<seconds>::