Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[karo-tx-linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0bf8a882ee9e18eb1bfba3ca05de68137211d1d8..08def8deb5f575652bffad8cc9dc7dded8ca059f 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -48,6 +48,7 @@ parameter is applicable:
        EFI     EFI Partitioning (GPT) is enabled
        EIDE    EIDE/ATAPI support is enabled.
        FB      The frame buffer device is enabled.
+       GCOV    GCOV profiling is enabled.
        HW      Appropriate hardware is enabled.
        IA-64   IA-64 architecture is enabled.
        IMA     Integrity measurement architecture is enabled.
@@ -491,6 +492,13 @@ and is between 256 and 4096 characters. It is defined in the file
                        Also note the kernel might malfunction if you disable
                        some critical bits.
 
+       cmo_free_hint=  [PPC] Format: { yes | no }
+                       Specify whether pages are marked as being inactive
+                       when they are freed.  This is used in CMO environments
+                       to determine OS memory pressure for page stealing by
+                       a hypervisor.
+                       Default: yes
+
        code_bytes      [X86] How many bytes of object code to print
                        in an oops report.
                        Range: 0 - 8192
@@ -539,6 +547,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        console=brl,ttyS0
                For now, only VisioBraille is supported.
 
+       consoleblank=   [KNL] The console blank (screen saver) timeout in
+                       seconds. Defaults to 10*60 = 10mins. A value of 0
+                       disables the blank timer.
+
        coredump_filter=
                        [KNL] Change the default value for
                        /proc/<pid>/coredump_filter.
@@ -785,6 +797,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: off | on
                        default: on
 
+       gcov_persist=   [GCOV] When non-zero (default), profiling data for
+                       kernel modules is saved and remains accessible via
+                       debugfs, even when the module is unloaded/reloaded.
+                       When zero, profiling data is discarded and associated
+                       debugfs files are removed at module unload time.
+
        gdth=           [HW,SCSI]
                        See header of drivers/scsi/gdth.c.
 
@@ -1073,7 +1091,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
        kgdboc=         [HW] kgdb over consoles.
                        Requires a tty driver that supports console polling.
-                       (only serial suported for now)
+                       (only serial supported for now)
                        Format: <serial_device>[,baud]
 
        kmac=           [MIPS] korina ethernet MAC address.
@@ -1402,7 +1420,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        ('y', default) or cooked coordinates ('n')
 
        mtrr_chunk_size=nn[KMG] [X86]
-                       used for mtrr cleanup. It is largest continous chunk
+                       used for mtrr cleanup. It is largest continuous chunk
                        that could hold holes aka. UC entries.
 
        mtrr_gran_size=nn[KMG] [X86]