Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[cascardo/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b7fa2f5..664fd88 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -566,6 +566,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        possible to determine what the correct size should be.
                        This option provides an override for these situations.
 
                        possible to determine what the correct size should be.
                        This option provides an override for these situations.
 

+       ca_keys=        [KEYS] This parameter identifies a specific key(s) on
+                       the system trusted keyring to be used for certificate
+                       trust validation.
+                       format: { id:<keyid> | builtin }
+
+       cca=            [MIPS] Override the kernel pages' cache coherency
+                       algorithm.  Accepted values range from 0 to 7
+                       inclusive. See arch/mips/include/asm/pgtable-bits.h
+                       for platform specific values (SB1, Loongson3 and
+                       others).
+

        ccw_timeout_log [S390]
                        See Documentation/s390/CommonIO for details.
 
        ccw_timeout_log [S390]
                        See Documentation/s390/CommonIO for details.
 


@@ -1097,6 +1108,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        that can be changed at run time by the
                        set_graph_function file in the debugfs tracing directory.
 
                        that can be changed at run time by the
                        set_graph_function file in the debugfs tracing directory.
 

+       ftrace_graph_notrace=[function-list]
+                       [FTRACE] Do not trace from the functions specified in
+                       function-list.  This list is a comma separated list of
+                       functions that can be changed at run time by the
+                       set_graph_notrace file in the debugfs tracing directory.
+

        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
                        support via parallel port (up to 5 devices per port)
        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
                        support via parallel port (up to 5 devices per port)


@@ -1313,6 +1330,23 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Formats: { "ima" | "ima-ng" }
                        Default: "ima-ng"
 
                        Formats: { "ima" | "ima-ng" }
                        Default: "ima-ng"
 

+       ima.ahash_minsize= [IMA] Minimum file size for asynchronous hash usage
+                       Format: <min_file_size>
+                       Set the minimal file size for using asynchronous hash.
+                       If left unspecified, ahash usage is disabled.
+
+                       ahash performance varies for different data sizes on
+                       different crypto accelerators. This option can be used
+                       to achieve the best performance for a particular HW.
+
+       ima.ahash_bufsize= [IMA] Asynchronous hash buffer size
+                       Format: <bufsize>
+                       Set hashing buffer size. Default: 4k.
+
+                       ahash performance varies for different chunk sizes on
+                       different crypto accelerators. This option can be used
+                       to achieve best performance for particular HW.
+

        init=           [KNL]
                        Format: <full_path>
                        Run specified binary instead of /sbin/init as init
        init=           [KNL]
                        Format: <full_path>
                        Run specified binary instead of /sbin/init as init


@@ -1416,10 +1450,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        ip=             [IP_PNP]
                        See Documentation/filesystems/nfs/nfsroot.txt.
 
        ip=             [IP_PNP]
                        See Documentation/filesystems/nfs/nfsroot.txt.
 

-       ip2=            [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
-                       See comment before ip2_setup() in
-                       drivers/char/ip2/ip2base.c.
-

        irqfixup        [HW]
                        When an interrupt is not handled search all handlers
                        for it. Intended to get systems with badly broken
        irqfixup        [HW]
                        When an interrupt is not handled search all handlers
                        for it. Intended to get systems with badly broken


@@ -1692,8 +1722,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        7 (KERN_DEBUG)          debug-level messages
 
        log_buf_len=n[KMG]      Sets the size of the printk ring buffer,
                        7 (KERN_DEBUG)          debug-level messages
 
        log_buf_len=n[KMG]      Sets the size of the printk ring buffer,

-                       in bytes.  n must be a power of two.  The default
-                       size is set in the kernel config file.
+                       in bytes.  n must be a power of two and greater
+                       than the minimal size. The minimal size is defined
+                       by LOG_BUF_SHIFT kernel config parameter. There is
+                       also CONFIG_LOG_CPU_MAX_BUF_SHIFT config parameter
+                       that allows to increase the default size depending on
+                       the number of CPUs. See init/Kconfig for more details.

 
        logo.nologo     [FB] Disables display of the built-in Linux logo.
                        This may be used to provide more screen space for
 
        logo.nologo     [FB] Disables display of the built-in Linux logo.
                        This may be used to provide more screen space for


@@ -2807,6 +2841,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        quiescent states.  Units are jiffies, minimum
                        value is one, and maximum value is HZ.
 
                        quiescent states.  Units are jiffies, minimum
                        value is one, and maximum value is HZ.
 

+       rcutree.rcu_nocb_leader_stride= [KNL]
+                       Set the number of NOCB kthread groups, which
+                       defaults to the square root of the number of
+                       CPUs.  Larger numbers reduces the wakeup overhead
+                       on the per-CPU grace-period kthreads, but increases
+                       that same overhead on each group's leader.
+

        rcutree.qhimark= [KNL]
                        Set threshold of queued RCU callbacks beyond which
                        batch limiting is disabled.
        rcutree.qhimark= [KNL]
                        Set threshold of queued RCU callbacks beyond which
                        batch limiting is disabled.


@@ -3023,6 +3064,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        S               [KNL] Run init in single mode
 
 
        S               [KNL] Run init in single mode
 

+       s390_iommu=     [HW,S390]
+                       Set s390 IOTLB flushing mode
+               strict
+                       With strict flushing every unmap operation will result in
+                       an IOTLB flush. Default is lazy flushing before reuse,
+                       which is faster.
+

        sa1100ir        [NET]
                        See drivers/net/irda/sa1100_ir.c.
 
        sa1100ir        [NET]
                        See drivers/net/irda/sa1100_ir.c.