summaryrefslogtreecommitdiffstats
path: root/kernel/trace
Commit message (Expand)AuthorAgeFilesLines
* blktrace: Remove blk_fill_rwbs_rq.Tao Ma2011-03-031-16/+0
* Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-02-091-0/+7
|\
| * blktrace: Don't output messages if NOTIFY isn't set.Tao Ma2011-01-191-0/+7
* | tracing: Replace syscall_meta_data struct array with pointer arraySteven Rostedt2011-02-031-9/+10
* | tracing: Replace trace_event struct array with pointer arraySteven Rostedt2011-02-022-9/+9
* | lockdep: Move early boot local IRQ enable/disable status to init/main.cTejun Heo2011-01-201-8/+0
|/
*-. Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-f...Linus Torvalds2011-01-151-21/+12
|\ \
| | * tracing: Remove syscall_exit_fieldsLai Jiangshan2011-01-141-21/+12
* | | Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-01-131-16/+21
|\ \ \
| * | | block: ensure that completion error gets properly tracedJens Axboe2011-01-101-9/+13
| * | | blktrace: add missing probe argument to block_bio_completeMathieu Desnoyers2011-01-071-1/+2
| * | | block: Rename "block_remap" tracepoint to "block_bio_remap" to clarify the ev...Mike Snitzer2010-11-161-6/+6
* | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-131-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into for-nextJiri Kosina2010-12-223-7/+29
| |\ \ \ \
| * | | | | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-011-1/+1
* | | | | | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-01-112-5/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | tracing: Fix TRACE_EVENT power tracepoint creationMathieu Desnoyers2011-01-071-1/+1
| * | | | | tracing: Fix preempt count leakLi Zefan2011-01-071-4/+2
| | |_|_|/ | |/| | |
* / | | | sched: Constify function scope static struct sched_param usagePeter Zijlstra2011-01-071-1/+1
|/ / / /
* | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-01-061-1/+1
|\ \ \ \
| * \ \ \ Merge commit 'v2.6.37' into sched/coreIngo Molnar2011-01-052-2/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'linus' into sched/coreIngo Molnar2010-12-081-0/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'v2.6.37-rc3' into sched/coreIngo Molnar2010-11-262-2/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'v2.6.37-rc2' into sched/coreIngo Molnar2010-11-188-187/+190
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | sched: Make sched_param argument static in sched_setscheduler() callersKOSAKI Motohiro2010-10-231-1/+1
* | | | | | | | perf: Clean up power events by introducing new, more generic onesThomas Renninger2011-01-042-0/+18
* | | | | | | | perf: Do not export power_frequency, but power_start eventThomas Renninger2011-01-041-1/+1
* | | | | | | | Merge commit 'v2.6.37-rc8' into perf/coreIngo Molnar2011-01-041-1/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | ring_buffer: Off-by-one and duplicate events in ring_buffer_read_pageDavid Sharp2010-12-231-1/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2010-12-222-4/+16
|\ \ \ \ \ \ \
| * | | | | | | tracing/events: Show real number in array fieldsSteven Rostedt2010-11-192-4/+16
* | | | | | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2010-12-161-1/+9
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g...Ingo Molnar2010-12-161-1/+9
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | tracing: Fix panic when lseek() called on "trace" opened for writingSlava Pestov2010-11-301-1/+9
| * | | | | | | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-11-271-0/+19
| |\| | | | | | | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge commit 'v2.6.37-rc3' into perf/coreIngo Molnar2010-11-262-2/+1
|\| | | | | | | |_|/ / / / |/| | | | |
| * | | | | BKL: remove extraneous #include <smp_lock.h>Arnd Bergmann2010-11-171-1/+0
| * | | | | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2010-11-161-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [S390] ftrace: build without frame pointers on s390Heiko Carstens2010-11-101-1/+1
| | | |_|/ | | |/| |
* | | | | Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/fre...Ingo Molnar2010-11-181-1/+30
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | tracing: New flag to allow non privileged users to use a trace eventFrederic Weisbecker2010-11-181-1/+30
| | |/ / | |/| |
* | | | Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel...Ingo Molnar2010-11-181-0/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | tracing: Fix recursive user stack traceSteven Rostedt2010-11-121-0/+19
| |/ /
* / / block: remove REQ_HARDBARRIERChristoph Hellwig2010-11-101-4/+0
|/ /
* | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-10-272-169/+174
|\ \
| * \ Merge branch 'tip/perf/ringbuffer-2' of git://git.kernel.org/pub/scm/linux/ke...Ingo Molnar2010-10-261-163/+172
| |\ \
| | * | ring-buffer: Remove unused macro RB_TIMESTAMPS_PER_PAGESteven Rostedt2010-10-201-3/+0
| | * | ring-buffer: Micro-optimize with some strategic inliningSteven Rostedt2010-10-201-8/+15
| | * | ring-buffer: Remove condition to add timestamp in fast pathSteven Rostedt2010-10-201-22/+6
| | * | ring-buffer: Bind time extend and data events togetherSteven Rostedt2010-10-201-124/+142