diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 04:58:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 04:58:10 +0200 |
| commit | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (patch) | |
| tree | 50b5f4e2b9f138da57f76eca44fdcc80a2fcd428 /arch/x86/kernel/apic/apic.c | |
| parent | Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | function-graph: always initialize task ret_stack (diff) | |
| download | linux-991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d.tar.xz linux-991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d.zip | |
Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
function-graph: always initialize task ret_stack
function-graph: move initialization of new tasks up in fork
function-graph: add memory barriers for accessing task's ret_stack
function-graph: enable the stack after initialization of other variables
function-graph: only allocate init tasks if it was not already done
Manually fix trivial conflict in kernel/trace/ftrace.c
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
0 files changed, 0 insertions, 0 deletions