Jiri Kosina
318ae2edc3
Merge branch 'for-next' into for-linus
...
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
Linus Torvalds
6556a67435
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
...
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (172 commits)
perf_event, amd: Fix spinlock initialization
perf_event: Fix preempt warning in perf_clock()
perf tools: Flush maps on COMM events
perf_events, x86: Split PMU definitions into separate files
perf annotate: Handle samples not at objdump output addr boundaries
perf_events, x86: Remove superflous MSR writes
perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in()
perf_events, x86: AMD event scheduling
perf_events: Add new start/stop PMU callbacks
perf_events: Report the MMAP pgoff value in bytes
perf annotate: Defer allocating sym_priv->hist array
perf symbols: Improve debugging information about symtab origins
perf top: Use a macro instead of a constant variable
perf symbols: Check the right return variable
perf/scripts: Tag syscall_name helper as not yet available
perf/scripts: Add perf-trace-python Documentation
perf/scripts: Remove unnecessary PyTuple resizes
perf/scripts: Add syscall tracing scripts
perf/scripts: Add Python scripting engine
perf/scripts: Remove check-perf-trace from listed scripts
...
Fix trivial conflict in tools/perf/util/probe-event.c
2010-02-28 10:20:25 -08:00
Ingo Molnar
6fb83029db
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
2010-02-27 10:06:10 +01:00
Mike Frysinger
e7b8e675d9
tracing: Unify arch_syscall_addr() implementations
...
Most implementations of arch_syscall_addr() are the same, so create a
default version in common code and move the one piece that differs (the
syscall table) to asm/syscall.h. New arch ports don't have to waste
time copying & pasting this simple function.
The s390/sparc versions need to be different, so document why.
Signed-off-by: Mike Frysinger <vapier@gentoo.org >
Acked-by: David S. Miller <davem@davemloft.net >
Acked-by: Paul Mundt <lethal@linux-sh.org >
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com >
Cc: Steven Rostedt <rostedt@goodmis.org >
LKML-Reference: <1264498803-17278-1-git-send-email-vapier@gentoo.org >
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com >
2010-02-17 13:07:21 +01:00
Daniel Mack
3ad2f3fbb9
tree-wide: Assorted spelling fixes
...
In particular, several occurances of funny versions of 'success',
'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address',
'beginning', 'desirable', 'separate' and 'necessary' are fixed.
Signed-off-by: Daniel Mack <daniel@caiaq.de >
Cc: Joe Perches <joe@perches.com >
Cc: Junio C Hamano <gitster@pobox.com >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2010-02-09 11:13:56 +01:00
Mike Frysinger
0368897034
tracing/documentation: Cover new frame pointer semantics
...
Update the graph tracer examples to cover the new frame pointer semantics
(in terms of passing it along). Move the HAVE_FUNCTION_GRAPH_FP_TEST docs
out of the Kconfig, into the right place, and expand on the details.
Signed-off-by: Mike Frysinger <vapier@gentoo.org >
LKML-Reference: <1264165967-18938-1-git-send-email-vapier@gentoo.org >
Signed-off-by: Steven Rostedt <rostedt@goodmis.org >
2010-01-26 17:00:39 -05:00
Yang Hongyang
6993b1bb1e
tracing/documentation: Fix a typo in ftrace.txt
...
'ftrace' is no longer the name of the function tracer, to activate
the function trace 'echo function > current_tracer' is to be used instead
of 'echo ftrace > current_tracer'. Update the documentation to reflect
the current implementation.
Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com >
LKML-Reference: <4B5D0BA8.20106@cn.fujitsu.com >
Signed-off-by: Steven Rostedt <rostedt@goodmis.org >
2010-01-26 16:59:33 -05:00
Motohiro KOSAKI
df3ab708b7
kprobetrace, doc: Add the explanation to remove probe points
...
Latest kprobetrace can remove probe points selectively, thus
the documentation should be updated too.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com >
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com >
Cc: systemtap <systemtap@sources.redhat.com >
Cc: DLE <dle-develop@lists.sourceforge.net >
LKML-Reference: <20100119023512.31880.35535.stgit@localhost6.localdomain6 >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2010-01-20 07:18:15 +01:00
Motohiro KOSAKI
580d9e00fd
kprobetrace, doc: Shell needs single quote to use $ character
...
Shell interprets $val as shell variable, thus we need quote if
we use the echo command.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com >
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com >
Cc: systemtap <systemtap@sources.redhat.com >
Cc: DLE <dle-develop@lists.sourceforge.net >
LKML-Reference: <20100119023505.31880.17367.stgit@localhost6.localdomain6 >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2010-01-20 07:18:14 +01:00
Masami Hiramatsu
14640106f2
tracing/kprobe: Drop function argument access syntax
...
Drop function argument access syntax, because the function
arguments depend on not only architecture but also
compile-options and function API. And now, we have perf-probe
for finding register/memory assigned to each argument.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com >
Cc: Frederic Weisbecker <fweisbec@gmail.com >
Cc: Arnaldo Carvalho de Melo <acme@redhat.com >
Cc: systemtap <systemtap@sources.redhat.com >
Cc: DLE <dle-develop@lists.sourceforge.net >
Cc: Frederic Weisbecker <fweisbec@gmail.com >
Cc: Steven Rostedt <rostedt@goodmis.org >
Cc: Roland McGrath <roland@redhat.com >
Cc: Oleg Nesterov <oleg@redhat.com >
Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Michael Neuling <mikey@neuling.org >
Cc: linuxppc-dev@ozlabs.org
LKML-Reference: <20100105224648.19431.52309.stgit@dhcp-100-2-132.bos.redhat.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2010-01-13 10:09:12 +01:00
Masami Hiramatsu
ec3a903960
tracing/kprobe: Update example output in documentation
...
Update example output in documentation according to current
implementation.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com >
Cc: Frederic Weisbecker <fweisbec@gmail.com >
Cc: Arnaldo Carvalho de Melo <acme@redhat.com >
Cc: systemtap <systemtap@sources.redhat.com >
Cc: DLE <dle-develop@lists.sourceforge.net >
Cc: Steven Rostedt <rostedt@goodmis.org >
Cc: Frederic Weisbecker <fweisbec@gmail.com >
LKML-Reference: <20100105224641.19431.34967.stgit@dhcp-100-2-132.bos.redhat.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2010-01-13 10:09:11 +01:00
Randy Dunlap
006b4298f2
Documentation: update ring-buffer-design.txt
...
Fix typos, grammos, spellos, hyphenation.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com >
Acked-by: Steven Rostedt <rostedt@goodmis.org >
Cc: Mel Gorman <mel@csn.ul.ie >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-01-11 09:34:07 -08:00
Linus Torvalds
b21c070403
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
...
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing: Fix sign fields in ftrace_define_fields_##call()
tracing/syscalls: Fix typo in SYSCALL_DEFINE0
tracing/kprobe: Show sign of fields in trace_kprobe format files
ksym_tracer: Remove trace_stat
ksym_tracer: Fix race when incrementing count
ksym_tracer: Fix to allow writing newline to ksym_trace_filter
ksym_tracer: Fix to make the tracer work
tracing: Kconfig spelling fixes and cleanups
tracing: Fix setting tracer specific options
Documentation: Update ftrace-design.txt
Documentation: Update tracepoint-analysis.txt
Documentation: Update mmiotrace.txt
2009-12-31 11:52:01 -08:00
Randy Dunlap
2ec91eec47
mm tracing: cleanup Documentation/trace/events-kmem.txt
...
Clean up typos/grammos/spellos in events-kmem.txt.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com >
Cc: Mel Gorman <mel@csn.ul.ie >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-12-22 14:17:55 -08:00
Randy Dunlap
7e25f44cbf
Documentation: Update ftrace-design.txt
...
Correct grammos. Spell out words. Add missing words.
Consistent use of "mcount()" function name.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com >
Acked-by: Steven Rostedt <rostedt@goodmis.org >
LKML-Reference: <4B2C0D78.6060707@oracle.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2009-12-20 06:18:25 +01:00
Randy Dunlap
b41df645c8
Documentation: Update tracepoint-analysis.txt
...
Fix grammar, spelling, punctuation, hyphenation, section
numbering. Tell what PCL means.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com >
Cc: Mel Gorman <mel@csn.ul.ie >
Cc: Steven Rostedt <rostedt@goodmis.org >
LKML-Reference: <4B2C0D70.4030707@oracle.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2009-12-20 06:18:25 +01:00
Randy Dunlap
360b6e5cab
Documentation: Update mmiotrace.txt
...
Fix typos, spellos, hyphenation, line lengths.
BTW: are there some userspace tools? There is a reference to
some at the wiki page, but there are no tools listed there.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com >
Acked-by: Pekka Paalanen <pq@iki.fi >
LKML-Reference: <4B2C0D68.6080401@oracle.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2009-12-20 06:18:23 +01:00
Ingo Molnar
a7b63425a4
Merge branch 'perf/core' into perf/probes
...
Resolved merge conflict in tools/perf/Makefile
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2009-11-17 10:17:47 +01:00
Masami Hiramatsu
77b44d1b7c
tracing/kprobes: Rename Kprobe-tracer to kprobe-event
...
Rename Kprobes-based event tracer to kprobes-based tracing event
(kprobe-event), since it is not a tracer but an extensible
tracing event interface.
This also changes CONFIG_KPROBE_TRACER to CONFIG_KPROBE_EVENT
and sets it y by default.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com >
Acked-by: Frederic Weisbecker <fweisbec@gmail.com >
Cc: Steven Rostedt <rostedt@goodmis.org >
Cc: Jim Keniston <jkenisto@us.ibm.com >
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com >
Cc: Christoph Hellwig <hch@infradead.org >
Cc: Frank Ch. Eigler <fche@redhat.com >
Cc: Jason Baron <jbaron@redhat.com >
Cc: K.Prasad <prasad@linux.vnet.ibm.com >
Cc: Peter Zijlstra <peterz@infradead.org >
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com >
LKML-Reference: <20091104001247.3454.14131.stgit@harusame>
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2009-11-04 13:02:48 +01:00
Ingo Molnar
a2e7127153
Merge commit 'v2.6.32-rc6' into perf/core
...
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2009-11-04 11:59:45 +01:00
Jiri Olsa
67b394f7f2
tracing: Fix comment typo and documentation example
...
Trivial patch to fix a documentation example and to fix a
comment.
Signed-off-by: Jiri Olsa <jolsa@redhat.com >
Signed-off-by: Steven Rostedt <rostedt@goodmis.org >
Cc: Frederic Weisbecker <fweisbec@gmail.com >
LKML-Reference: <20091023233646.871719877@goodmis.org >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2009-10-24 11:07:50 +02:00
Ingo Molnar
4331595650
Merge branch 'perf/core' into perf/probes
...
Conflicts:
tools/perf/Makefile
Merge reason:
- fix the conflict
- pick up the pr_*() infrastructure to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2009-10-23 08:23:20 +02:00
Frederic Weisbecker
459c6d15a0
tracing: Document HAVE_SYSCALL_TRACEPOINTS needs
...
Document the arch needed requirements to get the support for syscalls
tracing.
v2: HAVE_FTRACE_SYSCALLS have been changed to HAVE_SYSCALL_TRACEPOINTS
recently. Update this config name in the documentation then.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com >
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: Steven Rostedt <rostedt@goodmis.org >
Cc: Li Zefan <lizf@cn.fujitsu.com >
Cc: Masami Hiramatsu <mhiramat@redhat.com >
Cc: Jason Baron <jbaron@redhat.com >
Cc: Lai Jiangshan <laijs@cn.fujitsu.com >
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com >
Cc: Paul Mundt <lethal@linux-sh.org >
2009-10-14 09:54:38 +02:00
Masami Hiramatsu
2e06ff6389
tracing/kprobes: Make special variable names more self-explainable
...
Rename special variables to more self-explainable names as below:
- $rv to $retval
- $sa to $stack
- $aN to $argN
- $sN to $stackN
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: Arnaldo Carvalho de Melo <acme@redhat.com >
Cc: Steven Rostedt <rostedt@goodmis.org >
Cc: Mike Galbraith <efault@gmx.de >
Cc: Paul Mackerras <paulus@samba.org >
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl >
Cc: Christoph Hellwig <hch@infradead.org >
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com >
Cc: Jim Keniston <jkenisto@us.ibm.com >
Cc: Frank Ch. Eigler <fche@redhat.com >
LKML-Reference: <20091007222759.1684.3319.stgit@dhcp-100-2-132.bos.redhat.com >
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com >
2009-10-12 23:30:29 +02:00
Masami Hiramatsu
99329c44f2
tracing/kprobes: Remove '$ra' special variable
...
Remove '$ra' (return address) because it is already shown at the head of
each entry.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: Arnaldo Carvalho de Melo <acme@redhat.com >
Cc: Steven Rostedt <rostedt@goodmis.org >
Cc: Mike Galbraith <efault@gmx.de >
Cc: Paul Mackerras <paulus@samba.org >
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl >
Cc: Christoph Hellwig <hch@infradead.org >
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com >
Cc: Jim Keniston <jkenisto@us.ibm.com >
Cc: Frank Ch. Eigler <fche@redhat.com >
LKML-Reference: <20091007222748.1684.12711.stgit@dhcp-100-2-132.bos.redhat.com >
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com >
2009-10-12 19:24:05 +02:00