summaryrefslogtreecommitdiff
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-08-13 17:43:27 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-08-13 17:43:27 +1000
commitae5c4a05df5c573352fadeec0bf5b22f0e9b935c (patch)
tree9f64e34521f9f3d3c989cb60577f51de9b9c5989 /Documentation/kernel-parameters.txt
parent46d952fb22d5d3f4b738ec4d27f55b7f5b66e7b8 (diff)
parentb9ac3027b83eabd9686fa21c93b9fefa2d2cc760 (diff)
Merge commit 'tip/auto-latest'
Conflicts: arch/x86/include/asm/socket.h include/linux/rcupdate.h kernel/fork.c
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ca9381ff16e4..0e4a295be10c 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2545,6 +2545,11 @@ and is between 256 and 4096 characters. It is defined in the file
trace_buf_size=nn[KMG]
[FTRACE] will set tracing buffer size.
+ trace_event=[event-list]
+ [FTRACE] Set and start specified trace events in order
+ to facilitate early boot debugging.
+ See also Documentation/trace/events.txt
+
trix= [HW,OSS] MediaTrix AudioTrix Pro
Format:
<io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>