summaryrefslogtreecommitdiffstats
path: root/kernel/trace
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into export-slabhTejun Heo2010-04-053-7/+16
|\
| * Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-04-041-2/+9
| |\
| | * perf: Correctly align perf event tracing bufferFrederic Weisbecker2010-04-011-2/+9
| * | ring-buffer: Add missing unlockJulia Lawall2010-03-291-3/+5
| * | tracing: Fix lockdep warning in global_clock()Li Zefan2010-03-291-2/+2
| |/
* | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-3014-2/+13
|/
* Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2010-03-261-3/+11
|\
| * ring-buffer: Do 8 byte alignment for 64 bit that can not handle 4 byte alignSteven Rostedt2010-03-181-3/+11
* | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-03-185-75/+80
|\ \ | |/ |/|
| * perf: Fix unexported generic perf_arch_fetch_caller_regsFrederic Weisbecker2010-03-171-0/+2
| * perf: export perf_trace_regs and perf_arch_fetch_caller_regsXiao Guangrong2010-03-111-0/+1
| * perf: Drop the obsolete profile naming for trace eventsFrederic Weisbecker2010-03-105-74/+74
| * perf: Take a hot regs snapshot for trace eventsFrederic Weisbecker2010-03-103-5/+7
* | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-03-132-11/+15
|\ \
| * | ftrace: Replace read_barrier_depends() with rcu_dereference_raw()Paul E. McKenney2010-03-111-9/+13
| * | rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare()Paul E. McKenney2010-03-041-2/+2
* | | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2010-03-136-23/+77
|\ \ \
| * | | tracing: Do not record user stack trace from NMI contextSteven Rostedt2010-03-121-0/+7
| * | | tracing: Disable buffer switching when starting or stopping traceSteven Rostedt2010-03-121-0/+9
| * | | tracing: Use same local variable when resetting the ring bufferSteven Rostedt2010-03-121-4/+4
| * | | function-graph: Init curr_ret_stack with ret_stackSteven Rostedt2010-03-121-1/+1
| * | | ring-buffer: Move disabled check into preempt disable sectionLai Jiangshan2010-03-121-6/+6
| * | | Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/...Ingo Molnar2010-03-114-12/+48
| |\ \ \
| | * | | function-graph: Add tracing_thresh support to function_graph tracerTim Bird2010-03-053-5/+43
| | * | | tracing: Update the comm field in the right variable in update_max_trArnaldo Carvalho de Melo2010-03-051-2/+2
| | * | | function-graph: Use comment notation for func names of dangling '}'Steven Rostedt2010-03-051-1/+1
| | * | | function-graph: Fix unused reference to ftrace_set_func()Steven Rostedt2010-03-051-4/+2
| * | | | Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2010-03-048-236/+156
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | tracing: Fix warning in s_next of trace file opsLai Jiangshan2010-03-021-0/+1
| * | | | tracing: Include irqflags headers from trace clockFrederic Weisbecker2010-02-281-0/+1
* | | | | Merge branch 'for-next' into for-linusJiri Kosina2010-03-082-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | tree-wide: fix 'lenght' typo in comments and codeDaniel Mack2010-02-051-1/+1
| * | | | Fix misspellings of "truly" in comments.Adam Buchbinder2010-02-041-2/+2
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Linus Torvalds2010-03-034-5/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'master' into percpuTejun Heo2010-02-025-20/+52
| |\ \ \ \ | | |/ / /
| * | | | local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.cChristoph Lameter2010-01-052-0/+2
| * | | | Merge branch 'master' into percpuTejun Heo2010-01-0528-903/+3787
| |\ \ \ \
| * | | | | percpu: remove per_cpu__ prefix.Rusty Russell2009-10-292-5/+5
* | | | | | Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-03-011-2/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | blktrace: perform cleanup after setup errorDmitry Monakhov2010-02-281-2/+3
* | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-02-286-234/+152
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | ftrace: Remove record freezingMasami Hiramatsu2010-02-041-39/+0
| * | | | | ftrace/alternatives: Introducing *_text_reserved functionsMasami Hiramatsu2010-02-041-0/+15
| * | | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2010-01-293-14/+25
| |\ \ \ \ \
| * | | | | | tracing/kprobe: Cleanup unused return value of tracing functionsXiao Guangrong2010-01-291-17/+10
| * | | | | | perf: Factorize trace events raw sample buffer operationsXiao Guangrong2010-01-293-142/+67
| * | | | | | tracing/kprobe: Update kprobe tracing self test for new syntaxMasami Hiramatsu2010-01-171-8/+47
| * | | | | | tracing/kprobe: Drop function argument access syntaxMasami Hiramatsu2010-01-131-17/+1
| * | | | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2010-01-135-147/+123
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | perf events: Remove CONFIG_EVENT_PROFILELi Zefan2009-12-284-13/+14
OpenPOWER on IntegriCloud