summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'sched/core', 'core/core' and 'tracing/core' into cpus4096Ingo Molnar2008-11-2428-83/+985
|\ \
| | *-----. Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/ftrace',...Ingo Molnar2008-11-2411-86/+569
| | |\ \ \ \
| | | | | * | tracing/stack-tracer: introduce CONFIG_USER_STACKTRACE_SUPPORTTörök Edwin2008-11-231-0/+1
| | | | | * | tracing/stack-tracer: fix style issuesTörök Edwin2008-11-231-22/+29
| | | | | * | tracing: add support for userspace stacktraces in tracing/iter_ctrlTörök Edwin2008-11-231-0/+57
| | | |_|/ / | | |/| | |
| | | | * | Merge branch 'ppc/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/ro...Ingo Molnar2008-11-236-42/+489
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * powerpc/ppc32: ftrace, dynamic ftrace to handle modulesSteven Rostedt2008-11-203-7/+109
| | | | | * powerpc/ppc64: ftrace, handle module trampolines for dyn ftraceSteven Rostedt2008-11-204-11/+293
| | | | | * powerpc: ftrace, use probe_kernel API to modify codeSteven Rostedt2008-11-201-32/+21
| | | | | * powerpc: ftrace, convert to new dynamic ftrace arch APISteven Rostedt2008-11-202-6/+75
| | | | | * powerpc: ftrace, do not latency trace idleSteven Rostedt2008-11-201-0/+5
| | | * | | tracing/function-return-tracer: store return stack into task_struct and alloc...Frederic Weisbecker2008-11-233-44/+15
| | |/ / /
| | | | |
| | | \ \
| | | \ \
| | | \ \
| | *---. \ \ Merge branches 'tracing/profiling', 'tracing/options' and 'tracing/urgent' in...Ingo Molnar2008-11-2343-181/+304
| | |\ \ \ \ \ | | | | | |/ /
| | | | * | | tracing/function-return-tracer: add the overrun fieldFrederic Weisbecker2008-11-182-3/+14
| | | | | | |
| | | \ \ \ \
| | *-. \ \ \ \ Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-1964-321/+682
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |_| / / / | | |/| | / /
| | * | | | | tracing/function-return-tracer: support for dynamic ftrace on function return...Frederic Weisbecker2008-11-162-135/+141
| | * | | | | tracing/function-return-tracer: add a barrier to ensure return stack index is...Frederic Weisbecker2008-11-161-0/+1
| | |/ / / /
| | * | | | ftrace: pass module struct to arch dynamic ftrace functionsSteven Rostedt2008-11-162-3/+34
| | | | | |
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | *---. \ \ \ Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/function...Ingo Molnar2008-11-132-43/+6
| | |\ \ \ \ \ \
| | | | * | | | | tracing/function-return-tracer: call prepare_ftrace_return by registersFrederic Weisbecker2008-11-122-5/+1
| | | | * | | | | tracing/function-return-tracer: make the function return tracer locklessFrederic Weisbecker2008-11-121-38/+5
| | | |/ / / / /
| | * | | | | | trace: rename unlikely profiler to branch profilerSteven Rostedt2008-11-122-2/+2
| | * | | | | | tracing: branch tracer, fix vdso crashIngo Molnar2008-11-122-7/+5
| | * | | | | | tracing: profile likely and unlikely annotationsSteven Rostedt2008-11-121-0/+8
| | |/ / / / /
| | * | | | | Merge branch 'tracing/function-return-tracer' into tracing/fastbootIngo Molnar2008-11-126-7/+265
| | |\ \ \ \ \
| | | * | | | | tracing: function return tracer, build fixIngo Molnar2008-11-111-0/+1
| | | * | | | | tracing, x86: function return tracer, fix assembly constraintsIngo Molnar2008-11-111-1/+1
| | | * | | | | tracing, x86: clean up FUNCTION_RET_TRACER KconfigIngo Molnar2008-11-111-1/+1
| | | * | | | | tracing, x86: add low level support for ftrace return tracingFrederic Weisbecker2008-11-116-7/+264
| | * | | | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-1267-2300/+5489
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
| | * | | | | Merge branch 'tracing/urgent' into tracing/ftraceIngo Molnar2008-11-1144-196/+296
| | |\ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | *-. \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 't...Ingo Molnar2008-11-0812-47/+70
| | |\ \ \ \ \ \ \
| | | * | | | | | | ftrace: fix hardirq header for non ftrace archsSteven Rostedt2008-11-035-36/+0
| | * | | | | | | | ftrace: add quick function trace stopSteven Rostedt2008-11-063-0/+12
| | |/ / / / / / /
| | | | | | | | |
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | *---. \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tra...Ingo Molnar2008-11-039-8/+165
| | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | ftrace: nmi safe code clean upsSteven Rostedt2008-10-316-21/+21
| | | | | * | | | | | | ftrace: nmi update statisticsSteven Rostedt2008-10-301-2/+24
| | | | | * | | | | | | ftrace: nmi safe code modificationSteven Rostedt2008-10-306-1/+141
| | | | * | | | | | | | trace: add the MMIO-tracer to the tracer menu, cleanupPekka Paalanen2008-10-273-7/+2
| | | |/ / / / / / / /
| | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| *-----------. \ \ \ \ \ \ \ \ \ Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'cor...Ingo Molnar2008-11-246-17/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge branch 'linus' into core/lockingIngo Molnar2008-11-12732-6182/+75776
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | Merge commit 'v2.6.28-rc2' into core/lockingIngo Molnar2008-10-283482-67659/+253304
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | Merge commit 'v2.6.27-rc7' into core/lockingIngo Molnar2008-09-2363-541/+738
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths, v3Ingo Molnar2008-09-111-0/+1
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths, v2Nick Piggin2008-09-112-15/+5
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy pathsNick Piggin2008-09-102-1/+10
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-11-203-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | [ARM] 5330/1: mach-pxa: Fixup reset for systems using reboot=cold or other st...Jaya Kumar2008-11-171-3/+4
| | * | | | | | | | | | | | | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmia...Russell King2008-11-172-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | [ARM] pxa: fix incorrect PCMCIA PSKTSEL pin configuration for spitzEric Miao2008-11-161-1/+2
OpenPOWER on IntegriCloud