x86, 32-bit: trim memory not covered by wb mtrrs

[linux-2.6-block.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 17fc60e32443082da684a250e9e0b6fbecb34bbf..b8fadf5f75a3e388e29437af4604bba9d60210a8 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -370,7 +370,8 @@ and is between 256 and 4096 characters. It is defined in the file
                        configured.  Potentially dangerous and should only be
                        used if you are entirely sure of the consequences.
 
-       chandev=        [HW,NET] Generic channel device initialisation
+       ccw_timeout_log [S390]
+                       See Documentation/s390/CommonIO for details.
 
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
                        Format: { "0" | "1" }
@@ -382,6 +383,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        Value can be changed at runtime via
                                /selinux/checkreqprot.
 
+       cio_ignore=     [S390]
+                       See Documentation/s390/CommonIO for details.
+
+       cio_msg=        [S390]
+                       See Documentation/s390/CommonIO for details.
+
        clock=          [BUGS=X86-32, HW] gettimeofday clocksource override.
                        [Deprecated]
                        Forces specified clocksource (if available) to be used
@@ -409,8 +416,8 @@ and is between 256 and 4096 characters. It is defined in the file
                        [SPARC64] tick
                        [X86-64] hpet,tsc
 
-       code_bytes      [IA32] How many bytes of object code to print in an
-                       oops report.
+       code_bytes      [IA32/X86_64] How many bytes of object code to print
+                       in an oops report.
                        Range: 0 - 8192
                        Default: 64
 
@@ -563,6 +570,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        See drivers/char/README.epca and
                        Documentation/digiepca.txt.
 
+       disable_mtrr_trim [X86-64, Intel only]
+                       By default the kernel will trim any uncacheable
+                       memory out of your available memory pool based on
+                       MTRR settings.  This parameter disables that behavior,
+                       possibly causing your machine to run very slowly.
+
        dmasound=       [HW,OSS] Sound subsystem buffers
 
        dscc4.setup=    [NET]
@@ -653,6 +666,10 @@ and is between 256 and 4096 characters. It is defined in the file
 
        gamma=          [HW,DRM]
 
+       gart_fix_e820=  [X86_64] disable the fix e820 for K8 GART
+                       Format: off | on
+                       default: on
+
        gdth=           [HW,SCSI]
                        See header of drivers/scsi/gdth.c.
 
@@ -787,6 +804,16 @@ and is between 256 and 4096 characters. It is defined in the file
                        for translation below 32 bit and if not available
                        then look in the higher range.
 
+       io_delay=       [X86-32,X86-64] I/O delay method
+               0x80
+                       Standard port 0x80 based delay
+               0xed
+                       Alternate port 0xed based delay (needed on some systems)
+               udelay
+                       Simple two microseconds delay
+               none
+                       No delay
+
        io7=            [HW] IO7 for Marvel based alpha systems
                        See comment before marvel_specify_io7 in
                        arch/alpha/kernel/core_marvel.c.
@@ -1152,6 +1179,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nodisconnect    [HW,SCSI,M68K] Disables SCSI disconnects.
 
+       noefi           [X86-32,X86-64] Disable EFI runtime services support.
+
        noexec          [IA-64]
 
        noexec          [X86-32,X86-64]
@@ -1598,7 +1627,13 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: <vendor>:<model>:<flags>
                        (flags are integer value)
 
-       scsi_logging=   [SCSI]
+       scsi_logging_level=     [SCSI] a bit mask of logging levels
+                       See drivers/scsi/scsi_logging.h for bits.  Also
+                       settable via sysctl at dev.scsi.logging_level
+                       (/proc/sys/dev/scsi/logging_level).
+                       There is also a nice 'scsi_logging_level' script in the
+                       S390-tools package, available for download at
+                       http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html
 
        scsi_mod.scan=  [SCSI] sync (default) scans SCSI busses as they are
                        discovered.  async scans them in kernel threads,
@@ -1965,6 +2000,11 @@ and is between 256 and 4096 characters. It is defined in the file
                        vdso=1: enable VDSO (default)
                        vdso=0: disable VDSO mapping
 
+       vdso32=         [X86-32,X86-64]
+                       vdso32=2: enable compat VDSO (default with COMPAT_VDSO)
+                       vdso32=1: enable 32-bit VDSO (default)
+                       vdso32=0: disable 32-bit VDSO mapping
+
        vector=         [IA-64,SMP]
                        vector=percpu: enable percpu vector domain