Merge commit 'origin/master' into next

[linux-drm-fsl-dcu.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fd5cac013037defc68c3ef118ed70b476debee71..ad38006307725ff2a563d9e86e78230df0879e22 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -56,7 +56,6 @@ parameter is applicable:
        ISAPNP  ISA PnP code is enabled.
        ISDN    Appropriate ISDN support is enabled.
        JOY     Appropriate joystick support is enabled.
        ISAPNP  ISA PnP code is enabled.
        ISDN    Appropriate ISDN support is enabled.
        JOY     Appropriate joystick support is enabled.

-       KMEMTRACE kmemtrace is enabled.

        LIBATA  Libata driver is enabled
        LP      Printer support is enabled.
        LOOP    Loopback device support is enabled.
        LIBATA  Libata driver is enabled
        LP      Printer support is enabled.
        LOOP    Loopback device support is enabled.


@@ -329,11 +328,6 @@ and is between 256 and 4096 characters. It is defined in the file
                                    flushed before they will be reused, which
                                    is a lot of faster
 
                                    flushed before they will be reused, which
                                    is a lot of faster
 

-       amd_iommu_size= [HW,X86-64]
-                       Define the size of the aperture for the AMD IOMMU
-                       driver. Possible values are:
-                       '32M', '64M' (default), '128M', '256M', '512M', '1G'
-

        amijoy.map=     [HW,JOY] Amiga joystick support
                        Map of devices attached to JOY0DAT and JOY1DAT
                        Format: <a>,<b>
        amijoy.map=     [HW,JOY] Amiga joystick support
                        Map of devices attached to JOY0DAT and JOY1DAT
                        Format: <a>,<b>


@@ -497,6 +491,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.
 
                        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
        code_bytes      [X86] How many bytes of object code to print
                        in an oops report.
                        Range: 0 - 8192


@@ -646,6 +647,13 @@ and is between 256 and 4096 characters. It is defined in the file
                        DMA-API debugging code disables itself because the
                        architectural default is too low.
 
                        DMA-API debugging code disables itself because the
                        architectural default is too low.
 

+       dma_debug_driver=<driver_name>
+                       With this option the DMA-API debugging driver
+                       filter feature can be enabled at boot time. Just
+                       pass the driver to filter for as the parameter.
+                       The filter can be disabled or changed to another
+                       driver later using sysfs.
+

        dscc4.setup=    [NET]
 
        dtc3181e=       [HW,SCSI]
        dscc4.setup=    [NET]
 
        dtc3181e=       [HW,SCSI]


@@ -752,12 +760,25 @@ and is between 256 and 4096 characters. It is defined in the file
                        ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.
 
        ftrace=[tracer]
                        ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.
 
        ftrace=[tracer]

-                       [ftrace] will set and start the specified tracer
+                       [FTRACE] will set and start the specified tracer

                        as early as possible in order to facilitate early
                        boot debugging.
 
        ftrace_dump_on_oops
                        as early as possible in order to facilitate early
                        boot debugging.
 
        ftrace_dump_on_oops

-                       [ftrace] will dump the trace buffers on oops.
+                       [FTRACE] will dump the trace buffers on oops.
+
+       ftrace_filter=[function-list]
+                       [FTRACE] Limit the functions traced by the function
+                       tracer at boot up. function-list is a comma separated
+                       list of functions. This list can be changed at run
+                       time by the set_ftrace_filter file in the debugfs
+                       tracing directory. 
+
+       ftrace_notrace=[function-list]
+                       [FTRACE] Do not trace the functions specified in
+                       function-list. This list can be changed at run time
+                       by the set_ftrace_notrace file in the debugfs
+                       tracing directory.

 
        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
 
        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad


@@ -873,11 +894,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
        ide-core.nodma= [HW] (E)IDE subsystem
                        Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc
 
        ide-core.nodma= [HW] (E)IDE subsystem
                        Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc

-                       .vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom
-                       .chs .ignore_cable are additional options
-                       See Documentation/ide/ide.txt.
-
-       idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
+                       .vlb_clock .pci_clock .noflush .nohpa .noprobe .nowerr
+                       .cdrom .chs .ignore_cable are additional options

                        See Documentation/ide/ide.txt.
 
        ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
                        See Documentation/ide/ide.txt.
 
        ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem


@@ -914,6 +932,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        Formt: { "sha1" | "md5" }
                        default: "sha1"
 
                        Formt: { "sha1" | "md5" }
                        default: "sha1"
 

+       ima_tcb         [IMA]
+                       Load a policy which meets the needs of the Trusted
+                       Computing Base.  This means IMA will measure all
+                       programs exec'd, files mmap'd for exec, and all files
+                       opened for read by uid=0.
+

        in2000=         [HW,SCSI]
                        See header of drivers/scsi/in2000.c.
 
        in2000=         [HW,SCSI]
                        See header of drivers/scsi/in2000.c.
 


@@ -1054,24 +1078,19 @@ and is between 256 and 4096 characters. It is defined in the file
                        use the HighMem zone if it exists, and the Normal
                        zone if it does not.
 
                        use the HighMem zone if it exists, and the Normal
                        zone if it does not.
 

-       kmemtrace.enable=       [KNL,KMEMTRACE] Format: { yes | no }
-                               Controls whether kmemtrace is enabled
-                               at boot-time.
-
-       kmemtrace.subbufs=n     [KNL,KMEMTRACE] Overrides the number of
-                       subbufs kmemtrace's relay channel has. Set this
-                       higher than default (KMEMTRACE_N_SUBBUFS in code) if
-                       you experience buffer overruns.
-

        kgdboc=         [HW] kgdb over consoles.
                        Requires a tty driver that supports console polling.
        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.
                        Configure the RouterBoard 532 series on-chip
                        Ethernet adapter MAC address.
 
                        Format: <serial_device>[,baud]
 
        kmac=           [MIPS] korina ethernet MAC address.
                        Configure the RouterBoard 532 series on-chip
                        Ethernet adapter MAC address.
 

+       kmemleak=       [KNL] Boot-time kmemleak enable/disable
+                       Valid arguments: on, off
+                       Default: on
+

        kstack=N        [X86] Print N words from the kernel stack
                        in oops dumps.
 
        kstack=N        [X86] Print N words from the kernel stack
                        in oops dumps.
 


@@ -1390,7 +1409,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]
                        ('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]
                        that could hold holes aka. UC entries.
 
        mtrr_gran_size=nn[KMG] [X86]


@@ -1575,6 +1594,9 @@ and is between 256 and 4096 characters. It is defined in the file
        noinitrd        [RAM] Tells the kernel not to load any configured
                        initial RAM disk.
 
        noinitrd        [RAM] Tells the kernel not to load any configured
                        initial RAM disk.
 

+       nointremap      [X86-64, Intel-IOMMU] Do not enable interrupt
+                       remapping.
+

        nointroute      [IA-64]
 
        nojitter        [IA64] Disables jitter checking for ITC timers.
        nointroute      [IA-64]
 
        nojitter        [IA64] Disables jitter checking for ITC timers.


@@ -1660,6 +1682,14 @@ and is between 256 and 4096 characters. It is defined in the file
        oprofile.timer= [HW]
                        Use timer interrupt instead of performance counters
 
        oprofile.timer= [HW]
                        Use timer interrupt instead of performance counters
 

+       oprofile.cpu_type=      Force an oprofile cpu type
+                       This might be useful if you have an older oprofile
+                       userland or if you want common events.
+                       Format: { archperfmon }
+                       archperfmon: [X86] Force use of architectural
+                               perfmon on Intel CPUs instead of the
+                               CPU specific event set.
+

        osst=           [HW,SCSI] SCSI Tape Driver
                        Format: <buffer_size>,<write_threshold>
                        See also Documentation/scsi/st.txt.
        osst=           [HW,SCSI] SCSI Tape Driver
                        Format: <buffer_size>,<write_threshold>
                        See also Documentation/scsi/st.txt.