diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-01 15:54:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-01 18:49:02 -0400 |
commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
tree | 85acd4440799c46a372df9cad170fa0c21e59096 /Documentation/kernel-parameters.txt | |
parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
parent | 2e572895bf3203e881356a4039ab0fa428ed2639 (diff) |
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 240257dd4238..ebdeb7c4330e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -50,6 +50,7 @@ parameter is applicable: | |||
50 | ISAPNP ISA PnP code is enabled. | 50 | ISAPNP ISA PnP code is enabled. |
51 | ISDN Appropriate ISDN support is enabled. | 51 | ISDN Appropriate ISDN support is enabled. |
52 | JOY Appropriate joystick support is enabled. | 52 | JOY Appropriate joystick support is enabled. |
53 | KMEMTRACE kmemtrace is enabled. | ||
53 | LIBATA Libata driver is enabled | 54 | LIBATA Libata driver is enabled |
54 | LP Printer support is enabled. | 55 | LP Printer support is enabled. |
55 | LOOP Loopback device support is enabled. | 56 | LOOP Loopback device support is enabled. |
@@ -1078,6 +1079,15 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1078 | use the HighMem zone if it exists, and the Normal | 1079 | use the HighMem zone if it exists, and the Normal |
1079 | zone if it does not. | 1080 | zone if it does not. |
1080 | 1081 | ||
1082 | kmemtrace.enable= [KNL,KMEMTRACE] Format: { yes | no } | ||
1083 | Controls whether kmemtrace is enabled | ||
1084 | at boot-time. | ||
1085 | |||
1086 | kmemtrace.subbufs=n [KNL,KMEMTRACE] Overrides the number of | ||
1087 | subbufs kmemtrace's relay channel has. Set this | ||
1088 | higher than default (KMEMTRACE_N_SUBBUFS in code) if | ||
1089 | you experience buffer overruns. | ||
1090 | |||
1081 | movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter | 1091 | movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter |
1082 | is similar to kernelcore except it specifies the | 1092 | is similar to kernelcore except it specifies the |
1083 | amount of memory used for migratable allocations. | 1093 | amount of memory used for migratable allocations. |
@@ -2362,6 +2372,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2362 | 2372 | ||
2363 | tp720= [HW,PS2] | 2373 | tp720= [HW,PS2] |
2364 | 2374 | ||
2375 | trace_buf_size=nn[KMG] [ftrace] will set tracing buffer size. | ||
2376 | |||
2365 | trix= [HW,OSS] MediaTrix AudioTrix Pro | 2377 | trix= [HW,OSS] MediaTrix AudioTrix Pro |
2366 | Format: | 2378 | Format: |
2367 | <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq> | 2379 | <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq> |