summaryrefslogtreecommitdiffstats
path: root/kernel/trace
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'v2.6.37' into sched/coreIngo Molnar2011-01-052-2/+17
|\
| * ring_buffer: Off-by-one and duplicate events in ring_buffer_read_pageDavid Sharp2010-12-231-1/+8
| * 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 'linus' into sched/coreIngo Molnar2010-12-081-0/+19
|\ \ \ | |/ /
| * | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-11-271-0/+19
| |\ \ | | |/
| | * 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
* | | | Merge commit 'v2.6.37-rc3' into sched/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 commit 'v2.6.37-rc2' into sched/coreIngo Molnar2010-11-188-187/+190
|\ \ \ | |/ /
| * | 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
| | | * ring-buffer: Pass delta by value and not by referenceSteven Rostedt2010-10-201-8/+8
| | | * ring-buffer: Pass timestamp by value and not by referenceSteven Rostedt2010-10-201-10/+10
| | | * ring-buffer: Make write slow path out of lineSteven Rostedt2010-10-191-2/+5
| | * | tracing: Fix 'faild' -> 'failed' typoJoe Perches2010-10-231-1/+1
| | * | Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/g...Ingo Molnar2010-10-221-6/+2
| | |\ \
| | | * | tracing: Do not limit the size of the number of CPU buffersSteven Rostedt2010-10-211-6/+2
| * | | | Remove duplicate includes from many filesZimny Lech2010-10-271-1/+0
| * | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-241-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into for-nextJiri Kosina2010-08-111-17/+63
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into for-nextJiri Kosina2010-08-1026-2386/+754
| | |\ \ \ \ \
| | * | | | | | fix printk typo 'faild'Paul Bolle2010-08-091-1/+1
| * | | | | | | kdb,ftdump: Remove reference to internal kdb includeJason Wessel2010-10-221-1/+0
| * | | | | | | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-225-0/+12
| |\ \ \ \ \ \ \
| | * | | | | | | llseek: automatically add .llseek fopArnd Bergmann2010-10-155-0/+12
| * | | | | | | | Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-221-11/+3
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | blktrace: remove the big kernel lockArnd Bergmann2010-10-191-11/+3
| | |/ / / / / /
* | | | | | | | sched: Make sched_param argument static in sched_setscheduler() callersKOSAKI Motohiro2010-10-231-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-211-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'devel-stable' into develRussell King2010-10-191-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | | | | | |
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 's...Russell King2010-10-185-26/+43
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | ARM: 6314/1: ftrace: allow build without frame pointers on ARMRabin Vincent2010-09-021-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-10-2111-235/+634
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | tracing: Fix compile issue for trace_sched_wakeup.cSteven Rostedt2010-10-191-2/+1
| * | | | | | tracing: Remove parent recording in latency tracer graph optionsSteven Rostedt2010-10-181-1/+0
| * | | | | | tracing: Use one prologue for the preempt irqs off tracer function tracersSteven Rostedt2010-10-181-48/+48
| * | | | | | tracing: Use one prologue for the wakeup tracer function tracersSteven Rostedt2010-10-181-52/+50
| * | | | | | tracing: Graph support for wakeup tracerJiri Olsa2010-10-181-10/+221
| * | | | | | tracing: Make graph related irqs/preemptsoff functions globalJiri Olsa2010-10-183-52/+71
| * | | | | | tracing: Add proper check for irq_depth routinesJiri Olsa2010-10-181-4/+20
| * | | | | | tracing/trivial: Remove cast from void*matt mooney2010-10-182-3/+3
OpenPOWER on IntegriCloud