summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-12-286-8/+9
|\
| *-. Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/coreIngo Molnar2008-12-2538-530/+858
| |\ \
| * | | sched: let arch_update_cpu_topology indicate if topology changedHeiko Carstens2008-12-121-2/+3
| * | | Merge commit 'v2.6.28-rc8' into sched/coreIngo Molnar2008-12-1277-1700/+2613
| |\ \ \
| * \ \ \ Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-12-08100-905/+3215
| |\ \ \ \
| * \ \ \ \ Merge commit 'v2.6.28-rc6' into sched/coreIngo Molnar2008-11-2138-173/+283
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'linus' into sched/coreIngo Molnar2008-11-19150-2714/+6301
| |\ \ \ \ \ \
| * | | | | | | sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTERIngo Molnar2008-11-115-5/+5
| * | | | | | | Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-11-0732-114/+236
| |\ \ \ \ \ \ \
| * | | | | | | | x86, sched: enable wchan config menu item on 64-bitKen Chen2008-11-061-1/+1
* | | | | | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-2845-1198/+2221
|\ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| *-----. \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin...Ingo Molnar2008-12-2525-110/+289
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ | | | | | |/| | | | | | |
| | | * | | | | | | | | | Revert "x86: disable X86_PTRACE_BTS"Ingo Molnar2008-12-241-1/+0
| | | * | | | | | | | | | Merge branch 'linus' into tracing/hw-branch-tracingIngo Molnar2008-12-2417-66/+164
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | x86, bts: memory accountingMarkus Metzger2008-12-201-11/+34
| | | * | | | | | | | | | x86, bts: add fork and exit handlingMarkus Metzger2008-12-206-32/+85
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * / | | | | | | | | tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3Frederic Weisbecker2008-12-253-2/+8
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'x86/tsc' into tracing/coreIngo Molnar2008-12-255-5/+37
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i...Ingo Molnar2008-12-1967-1495/+2418
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/...Ingo Molnar2008-12-181-33/+28
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | x86, bts: correctly report invalid bts recordsMarkus Metzger2008-12-161-0/+3
| | * | | | | | | | | | | x86, bts: remove recursion from get_contextMarkus Metzger2008-12-161-33/+25
| * | | | | | | | | | | | x86: entry_64 - introduce FTRACE_ frame macro v2Cyrill Gorcunov2008-12-172-51/+35
| |/ / / / / / / / / / /
| | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-graph-...Ingo Molnar2008-12-1613-873/+817
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | x86, bts: fix build errorIngo Molnar2008-12-121-1/+1
| | | * | | | | | | | | | | x86, bts: provide in-kernel branch-trace interfaceMarkus Metzger2008-12-129-871/+810
| | | * | | | | | | | | | | x86, bts: turn BUG_ON into WARN_ON_ONCEMarkus Metzger2008-12-122-4/+5
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | tracing/function-graph-tracer: add a new .irqentry.text section, fixIngo Molnar2008-12-121-0/+1
| | * | | | | | | | | | | tracing/function-graph-tracer: annotate do_IRQ and smp_apic_timer_interruptFrederic Weisbecker2008-12-122-2/+4
| | * | | | | | | | | | | tracing/function-graph-tracer: add a new .irqentry.text sectionFrederic Weisbecker2008-12-121-0/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | tracing/function-graph-tracer: append the tracing_graph_flagFrederic Weisbecker2008-12-081-1/+4
| * | | | | | | | | | | tracing/function-graph-tracer: introduce __notrace_funcgraph to filter specia...Frederic Weisbecker2008-12-083-8/+6
| * | | | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing...Ingo Molnar2008-12-0526-657/+875
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ftrace: add checks on ret stack in function graphSteven Rostedt2008-12-031-0/+17
| * | | | | | | | | | | | ftrace: function graph return for function entrySteven Rostedt2008-12-033-1/+12
| * | | | | | | | | | | | ftrace: print real return in dumpstack for function graphSteven Rostedt2008-12-034-6/+42
| * | | | | | | | | | | | ftrace: add ftrace_graph_stop()Steven Rostedt2008-12-031-4/+6
| * | | | | | | | | | | | ftrace: have function graph use mcount caller addressSteven Rostedt2008-12-032-0/+2
| * | | | | | | | | | | | ftrace: clean up function graph asmSteven Rostedt2008-12-031-16/+4
| | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftraceIngo Molnar2008-12-0393-1413/+3511
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tracing/function-graph-tracer: support for x86-64Frederic Weisbecker2008-12-024-2/+86
| * | | | | | | | | | | | | | Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-g...Ingo Molnar2008-12-025-140/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | powerpc/ppc32: static ftrace fixes for PPC32Steven Rostedt2008-11-282-0/+4
| | * | | | | | | | | | | | | | powerpc: ftrace, use create_branchSteven Rostedt2008-11-281-42/+12
| | * | | | | | | | | | | | | | powerpc: ftrace, added missing icache flushSteven Rostedt2008-11-281-0/+9
| | * | | | | | | | | | | | | | powerpc: ftrace, fix cast aliasing and add code verificationSteven Rostedt2008-11-281-56/+65
| | * | | | | | | | | | | | | | powerpc: ftrace, do nothing in mcount call for dyn ftraceSteven Rostedt2008-11-282-43/+9
| | | | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/function-graph-...Ingo Molnar2008-11-277-29/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | tracing: add "power-tracer": C/P state tracer to help power optimizationArjan van de Ven2008-11-262-0/+20
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | ftrace: use code patching for ftrace graph tracerSteven Rostedt2008-11-262-2/+51