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

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

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Includes smaller fixes and improvements plus the exclude_{host,guest} feature
test and fallback to handle older kernels.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents f8d98f10 808e1226

tools/perf/Documentation/perf-record.txt

+2 −2
Original line number Diff line number Diff line
@@ -52,11 +52,11 @@ OPTIONS 


-p::

--pid=::

	Record events on existing process ID.

	Record events on existing process ID (comma separated list).



-t::

--tid=::

        Record events on existing thread ID.

        Record events on existing thread ID (comma separated list).



-u::

--uid=::

tools/perf/Documentation/perf-stat.txt

+2 −2
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ OPTIONS 
        child tasks do not inherit counters

-p::

--pid=<pid>::

        stat events on existing process id

        stat events on existing process id (comma separated list)



-t::

--tid=<tid>::

        stat events on existing thread id

        stat events on existing thread id (comma separated list)





-a::

tools/perf/Documentation/perf-top.txt

+2 −2
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ Default is to monitor all CPUS. 


-p <pid>::

--pid=<pid>::

	Profile events on existing Process ID.

	Profile events on existing Process ID (comma separated list).



-t <tid>::

--tid=<tid>::

        Profile events on existing thread ID.

        Profile events on existing thread ID (comma separated list).



-u::

--uid=::

tools/perf/MANIFEST

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ lib/rbtree.c 
include/linux/swab.h

arch/*/include/asm/unistd*.h

arch/*/lib/memcpy*.S

arch/*/lib/memset*.S

include/linux/poison.h

include/linux/magic.h

include/linux/hw_breakpoint.h

tools/perf/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -183,7 +183,10 @@ SCRIPT_SH += perf-archive.sh 
grep-libs = $(filter -l%,$(1))

strip-libs = $(filter-out -l%,$(1))



$(OUTPUT)python/perf.so: $(PYRF_OBJS)

PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)

PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py



$(OUTPUT)python/perf.so: $(PYRF_OBJS) $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)

	$(QUIET_GEN)CFLAGS='$(BASIC_CFLAGS)' $(PYTHON_WORD) util/setup.py \

	  --quiet build_ext; \

	mkdir -p $(OUTPUT)python && \
@@ -256,6 +259,7 @@ LIB_H += util/callchain.h 
LIB_H += util/build-id.h

LIB_H += util/debug.h

LIB_H += util/debugfs.h

LIB_H += util/sysfs.h

LIB_H += util/event.h

LIB_H += util/evsel.h

LIB_H += util/evlist.h
@@ -302,6 +306,7 @@ LIB_OBJS += $(OUTPUT)util/build-id.o 
LIB_OBJS += $(OUTPUT)util/config.o

LIB_OBJS += $(OUTPUT)util/ctype.o

LIB_OBJS += $(OUTPUT)util/debugfs.o

LIB_OBJS += $(OUTPUT)util/sysfs.o

LIB_OBJS += $(OUTPUT)util/environment.o

LIB_OBJS += $(OUTPUT)util/event.o

LIB_OBJS += $(OUTPUT)util/evlist.o