summaryrefslogtreecommitdiffstats
path: root/arch/x86
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'sched/core', 'core/core' and 'tracing/core' into cpus4096Ingo Molnar2008-11-2418-29/+482
|\ \
| | *---. Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/ftrace',...Ingo Molnar2008-11-245-44/+80
| | |\ \ \
| | | | | * 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
| | | |_|/ | | |/| |
| | | * | 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-2318-26/+164
| | |\ \ \ \ | | | | | |/
| | | | * | 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-1910-25/+10
| | |\ \ \ \ \ | | | | |/ / / | | | |_| / / | | |/| | /
| | * | | | 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-122-3/+3
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | * | | | Merge branch 'tracing/urgent' into tracing/ftraceIngo Molnar2008-11-1118-51/+66
| | |\ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | *-. \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 't...Ingo Molnar2008-11-088-27/+70
| | |\ \ \ \ \ \
| | | * | | | | | ftrace: fix hardirq header for non ftrace archsSteven Rostedt2008-11-031-16/+0
| | * | | | | | | ftrace: add quick function trace stopSteven Rostedt2008-11-063-0/+12
| | |/ / / / / /
| | | | | | | |
| | | \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | *---. \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tra...Ingo Molnar2008-11-035-8/+145
| | |\ \ \ \ \ \ \ \
| | | | | * | | | | | ftrace: nmi safe code clean upsSteven Rostedt2008-10-312-13/+13
| | | | | * | | | | | ftrace: nmi update statisticsSteven Rostedt2008-10-301-2/+24
| | | | | * | | | | | ftrace: nmi safe code modificationSteven Rostedt2008-10-302-1/+121
| | | | * | | | | | | 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-245-10/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'linus' into core/lockingIngo Molnar2008-11-1266-210/+398
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / | | | | | |/| | | | | | | |
| | | | * | | | | | | | | | Merge commit 'v2.6.28-rc2' into core/lockingIngo Molnar2008-10-28586-14873/+58376
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / | | | | | |/| | | | | | | |
| | | | * | | | | | | | | | Merge commit 'v2.6.27-rc7' into core/lockingIngo Molnar2008-09-239-30/+27
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | 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 commit 'v2.6.28-rc6' into sched/coreIngo Molnar2008-11-2116-23/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | x86: Fix interrupt leak due to migrationMatthew Wilcox2008-11-201-0/+14
| * | | | | | | | | | | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-11-202-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | x86: uaccess_64: fix return value in __copy_from_user()Hiroshi Shimamoto2008-11-181-1/+1
| | * | | | | | | | | | | | | x86: quirk for reboot stalls on a Dell Optiplex 330Steve Conklin2008-11-181-0/+9
| * | | | | | | | | | | | | | Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/...Linus Torvalds2008-11-194-1/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | x86: make NUMA on 32-bit depend on EXPERIMENTAL againRafael J. Wysocki2008-11-121-1/+1
| | * | | | | | | | | | | | | | x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA setRafael J. Wysocki2008-11-123-0/+43
| | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-11-199-19/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2008-11-1814-31/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud