summaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 11:37:57 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 11:37:57 +1100
commite6ec25b6f514d9390570b1c229c24da2b1e25630 (patch)
tree92b3d3fb85326070f70809efcab77810284baec0 /Documentation/kernel-parameters.txt
parent33a9c4e97c8d2274fe25d38489398ab5ba83e6b4 (diff)
parentdd153cbe3f53a8d25d414c1861a4194e8eb89cce (diff)
Merge commit 'ftrace/auto-ftrace-next'
Conflicts: kernel/trace/ring_buffer.c scripts/recordmcount.pl
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4245ba4478e3..f3bd739bdd97 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -751,6 +751,14 @@ and is between 256 and 4096 characters. It is defined in the file
parameter will force ia64_sal_cache_flush to call
ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.
+ ftrace=[tracer]
+ [ftrace] will set and start the specified tracer
+ as early as possible in order to facilitate early
+ boot debugging.
+
+ ftrace_dump_on_oops
+ [ftrace] will dump the trace buffers on oops.
+
gamecon.map[2|3]=
[HW,JOY] Multisystem joystick and NES/SNES/PSX pad
support via parallel port (up to 5 devices per port)