Linus Torvalds
92b29b86fe
Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits)
tracing/fastboot: improve help text
tracing/stacktrace: improve help text
tracing/fastboot: fix initcalls disposition in bootgraph.pl
tracing/fastboot: fix bootgraph.pl initcall name regexp
tracing/fastboot: fix issues and improve output of bootgraph.pl
tracepoints: synchronize unregister static inline
tracepoints: tracepoint_synchronize_unregister()
ftrace: make ftrace_test_p6nop disassembler-friendly
markers: fix synchronize marker unregister static inline
tracing/fastboot: add better resolution to initcall debug/tracing
trace: add build-time check to avoid overrunning hex buffer
ftrace: fix hex output mode of ftrace
tracing/fastboot: fix initcalls disposition in bootgraph.pl
tracing/fastboot: fix printk format typo in boot tracer
ftrace: return an error when setting a nonexistent tracer
ftrace: make some tracers reentrant
ring-buffer: make reentrant
ring-buffer: move page indexes into page headers
tracing/fastboot: only trace non-module initcalls
ftrace: move pc counter in irqtrace
...
Manually fix conflicts:
- init/main.c: initcall tracing
- kernel/module.c: verbose level vs tracepoints
- scripts/bootgraph.pl: fallout from cherry-picking commits.
2008-10-20 13:35:07 -07:00
..
2008-10-16 16:52:53 +02:00
2008-10-20 13:23:01 -07:00
2008-10-16 16:52:53 +02:00
2008-10-16 16:52:53 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-15 21:55:59 +02:00
2008-10-16 16:52:53 +02:00
2008-10-20 13:23:01 -07:00
2008-10-16 16:53:13 +02:00
2008-07-22 21:31:34 +02:00
2008-10-15 12:48:44 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
2008-08-21 13:46:25 +02:00
2008-07-22 21:31:34 +02:00
2008-10-10 19:47:12 +02:00
2008-10-10 19:47:12 +02:00
2008-10-16 16:53:04 +02:00
2008-07-26 16:29:23 +02:00
2008-08-11 16:43:09 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
2008-07-22 21:31:34 +02:00
2008-10-12 15:09:23 +02:00
2008-10-10 19:47:12 +02:00
Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2
2008-10-12 15:50:02 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-09-10 08:21:05 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-10 19:30:08 +02:00
2008-07-22 21:31:34 +02:00
2008-07-16 12:15:17 -07:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-11 20:23:20 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-13 10:33:22 +02:00
2008-10-06 16:15:57 +02:00
2008-07-22 21:31:34 +02:00
2008-10-10 19:47:12 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:17:23 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 18:06:53 +02:00
2008-07-22 21:31:34 +02:00
2008-10-16 16:53:13 +02:00
2008-10-16 15:40:05 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-13 10:34:23 +02:00
2008-10-13 10:34:23 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-14 10:34:44 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-10-10 19:47:12 +02:00
2008-10-16 16:52:53 +02:00
2008-10-11 20:17:36 +02:00
2008-10-06 16:15:57 +02:00
2008-10-06 16:15:57 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-16 16:53:07 +02:00
2008-07-26 15:30:40 +02:00
2008-10-16 16:53:04 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 18:06:53 +02:00
2008-07-22 21:31:34 +02:00
2008-07-26 16:29:23 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
2008-07-22 21:31:34 +02:00
2008-07-26 15:30:40 +02:00
2008-10-13 10:20:58 +02:00
2008-10-16 16:52:58 +02:00
2008-10-13 10:21:01 +02:00
2008-10-13 09:51:40 -07:00
2008-10-16 11:21:33 -07:00
2008-07-22 21:31:34 +02:00
2008-07-26 16:29:23 +02:00
2008-07-22 21:31:34 +02:00
2008-07-12 08:45:05 +02:00
2008-10-16 16:52:53 +02:00
2008-10-16 16:52:57 +02:00
2008-10-13 10:22:04 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-25 12:01:37 -07:00
2008-10-13 10:33:04 +02:00
2008-10-06 16:15:57 +02:00
2008-10-06 16:15:57 +02:00
2008-07-22 21:31:34 +02:00
2008-10-13 10:20:02 +02:00
2008-10-15 14:25:35 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-15 10:15:12 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
2008-09-23 12:21:42 +02:00
2008-10-06 16:15:57 +02:00
2008-10-06 16:15:57 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2
2008-10-12 15:50:02 +02:00
2008-10-13 10:22:48 +02:00
2008-07-22 21:31:34 +02:00
2008-10-16 16:52:58 +02:00
2008-07-22 21:31:34 +02:00
2008-07-26 16:29:23 +02:00
2008-10-15 10:16:14 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-13 10:33:27 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-15 12:48:44 +02:00
2008-10-15 12:48:44 +02:00
2008-10-13 10:33:15 +02:00
2008-07-22 21:31:34 +02:00
2008-10-12 12:37:32 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
2008-07-22 21:31:34 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-22 21:31:34 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-22 21:31:34 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-10-16 15:08:45 -07:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 12:24:00 +02:00
2008-07-30 19:49:24 +02:00
Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2
2008-10-12 15:50:02 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:17:23 +02:00
2008-10-13 10:33:21 +02:00
2008-07-22 21:31:34 +02:00
2008-10-15 10:15:17 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-13 10:21:32 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 18:06:53 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-30 19:49:27 +02:00
2008-08-13 12:59:29 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 18:06:53 +02:00
2008-10-13 10:22:50 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-12 13:20:25 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-13 17:13:56 +01:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
2008-07-22 21:31:34 +02:00
2008-09-05 17:53:16 +02:00
2008-07-25 09:19:05 +05:30
2008-07-22 21:31:34 +02:00
2008-10-13 10:21:12 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-11 20:23:20 +02:00
2008-10-06 18:06:53 +02:00
2008-10-06 18:06:53 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-12 12:37:32 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-13 10:33:20 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-10-06 16:15:57 +02:00
2008-10-06 16:15:57 +02:00
2008-07-30 19:49:27 +02:00
2008-07-22 21:31:34 +02:00
2008-07-26 15:30:40 +02:00
2008-07-26 15:30:40 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-22 21:31:34 +02:00
2008-07-30 19:49:36 +02:00
2008-07-30 19:50:35 +02:00