1 files changed, 69 insertions, 4 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index db122df5e77d..92c40d174355 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -34,6 +34,7 @@ parameter is applicable:
         ALSA    ALSA sound support is enabled.
         APIC    APIC support is enabled.
         APM     Advanced Power Management support is enabled.
+        AVR32   AVR32 architecture is enabled.
         AX25    Appropriate AX.25 support is enabled.
         BLACKFIN Blackfin architecture is enabled.
         DRM     Direct Rendering Management support is enabled.
@@ -369,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" }
@@ -381,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
@@ -408,8 +416,21 @@ 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.
+        clearcpuid=BITNUM [X86]
+                        Disable CPUID feature X for the kernel. See
+                        include/asm-x86/cpufeature.h for the valid bit numbers.
+                        Note the Linux specific bits are not necessarily
+                        stable over kernel options, but the vendor specific
+                        ones should be.
+                        Also note that user programs calling CPUID directly
+                        or using the feature without checking anything
+                        will still see it. This just prevents it from
+                        being used by the kernel or shown in /proc/cpuinfo.
+                        Also note the kernel might malfunction if you disable
+                        some critical bits.
+
+        code_bytes      [IA32/X86_64] How many bytes of object code to print
+                        in an oops report.
                         Range: 0 - 8192
                         Default: 64
 
@@ -562,6 +583,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, Intel and AMD 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]
@@ -652,6 +679,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 +818,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.
@@ -1052,6 +1093,11 @@ and is between 256 and 4096 characters. It is defined in the file
                         Multi-Function General Purpose Timers on AMD Geode
                         platforms.
 
+        mfgptfix        [X86-32] Fix MFGPT timers on AMD Geode platforms when
+                        the BIOS has incorrectly applied a workaround. TinyBIOS
+                        version 0.98 is known to be affected, 0.99 fixes the
+                        problem by letting the user disable the workaround.
+
         mga=            [HW,DRM]
 
         mousedev.tap_time=
@@ -1124,6 +1170,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         of returning the full 64-bit number.
                         The default is to return 64-bit inode numbers.
 
+        nmi_debug=      [KNL,AVR32] Specify one or more actions to take
+                        when a NMI is triggered.
+                        Format: [state][,regs][,debounce][,die]
+
         nmi_watchdog=   [KNL,BUGS=X86-32] Debugging features for SMP kernels
 
         no387           [BUGS=X86-32] Tells the kernel to use the 387 maths
@@ -1148,6 +1198,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]
@@ -1158,6 +1210,8 @@ and is between 256 and 4096 characters. It is defined in the file
                         register save and restore. The kernel will only save
                         legacy floating-point registers on task switch.
 
+        noclflush       [BUGS=X86] Don't use the CLFLUSH instruction
+
         nohlt           [BUGS=ARM]
 
         no-hlt          [BUGS=X86-32] Tells the kernel that the hlt
@@ -1594,7 +1648,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,
@@ -1961,6 +2021,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