summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* tracing, powerpc: fix powerpc tree and tracing tree interactionStephen Rothwell2009-04-021-5/+1
* Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-0237-132/+627
|\
| *---. Merge branches 'tracing/docs', 'tracing/filters', 'tracing/ftrace', 'tracing/...Ingo Molnar2009-03-312-13/+10
| |\ \ \
| | | * | x86: kretprobe-booster interrupt emulation code fixMasami Hiramatsu2009-03-251-8/+9
| | |/ / | |/| |
| | * | function-graph: moved the timestamp from arch to generic codeSteven Rostedt2009-03-241-5/+1
| |/ /
| * | Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2009-03-201-23/+40
| |\ \ | | |/ | |/|
| | * ftrace: protect running nmi (V3)Lai Jiangshan2009-03-181-23/+40
| * | Merge branches 'tracing/ftrace', 'tracing/kprobes', 'tracing/tasks' and 'linu...Ingo Molnar2009-03-2012-104/+251
| |\ \ | | |/ | |/|
| * | Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-03-182-45/+68
| |\ \
| | \ \
| | \ \
| *-. \ \ Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/...Ingo Molnar2009-03-1683-1267/+3516
| |\ \ \ \
| | * \ \ \ Merge branch 'x86/asm' into tracing/syscallsIngo Molnar2009-03-1428-269/+1408
| | |\ \ \ \
| | * | | | | tracing/syscalls: support for syscalls tracing on x86, fixIngo Molnar2009-03-131-1/+2
| | * | | | | tracing/syscalls: support for syscalls tracing on x86Frederic Weisbecker2009-03-132-0/+70
| |/ / / / /
| * | | | | tracing/x86: basic implementation of syscall tracing for x86Frederic Weisbecker2009-03-133-3/+14
| * | | | | Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-1327-487/+549
| |\ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/...Ingo Molnar2009-03-104-11/+17
| |\ \ \ \ \ \ \
| | * | | | | | | x86: expand irq-off region in text_poke()Masami Hiramatsu2009-03-101-2/+2
| * | | | | | | | Merge branch 'x86/core' into tracing/ftraceIngo Molnar2009-03-1013-146/+182
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | | | | | | | |
| | \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' ...Ingo Molnar2009-03-1078-1607/+726
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | x86: implement atomic text_poke() via fixmapMasami Hiramatsu2009-03-062-9/+17
| * | | | | | | | | | tracing, Text Edit Lock - SMP alternatives supportMasami Hiramatsu2009-03-061-0/+5
| * | | | | | | | | | Merge branch 'x86/core' into tracing/texteditIngo Molnar2009-03-06394-17749/+14650
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into trac...Ingo Molnar2009-03-061-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | tracing/function-graph-tracer: use the more lightweight local clockFrederic Weisbecker2009-03-051-1/+1
| * | | | | | | | | | | tracing: clean up menuIngo Molnar2009-03-051-0/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/coreIngo Molnar2009-03-0417-49/+42
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2009-03-0210-0/+10
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | tracing: make CALLER_ADDRx overwriteableUwe Kleine-Koenig2009-03-0210-0/+10
| | * | | | | | | | | | | Merge branch 'sched/clock' into tracing/ftraceIngo Molnar2009-02-261-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing...Ingo Molnar2009-03-0225-238/+340
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-02-277-31/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sched/clock' into tracing/ftraceIngo Molnar2009-02-271-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | / / / / / / / / / / / | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'linus' into...Ingo Molnar2009-02-2628-78/+1681
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | x86, ptrace: remove CONFIG guards around declarationsMarkus Metzger2009-02-241-3/+0
| | * | | | | | | | | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/coreIngo Molnar2009-02-2426-75/+1675
| |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/gi...Ingo Molnar2009-02-226-19/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | ftrace: immediately stop code modification if failure is detectedSteven Rostedt2009-02-201-0/+4
| | * | | | | | | | | | | | | | | | ftrace, x86: make kernel text writable only for conversionsSteven Rostedt2009-02-204-8/+82
| * | | | | | | | | | | | | | | | | Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/coreIngo Molnar2009-02-2029-92/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mainline/function-graph' of git://git.kernel.org/pub/scm/linux/...Ingo Molnar2009-02-193-99/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into tracing/blktraceIngo Molnar2009-02-1939-193/+208
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2009-02-152-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | tracing: convert c/p state power tracer to use tracepointsJason Baron2009-02-132-0/+5
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/...Ingo Molnar2009-02-133-34/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | preempt-count: force hardirq-count to max of 10Steven Rostedt2009-02-123-34/+0
| | | | | | | | | | | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 't...Ingo Molnar2009-02-1363-311/+396
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2009-02-111-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | tracing, x86: fix constraint for parent variableSteven Rostedt2009-02-101-5/+4
| * | | | | | | | | | | | | | | | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2009-02-111-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2009-02-105-7/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |