1 files changed, 52 insertions, 6 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 06b2cd5739dd..c73d27184c13 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -571,6 +571,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         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.
 
@@ -1102,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.
 
+        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)
@@ -1442,10 +1454,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
         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
@@ -1718,8 +1726,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,
-                        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
@@ -2192,6 +2204,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         and restore using xsave. The kernel will fallback to
                         enabling legacy floating-point and sse state.
 
+        noxsaveopt      [X86] Disables xsaveopt used in saving x86 extended
+                        register states. The kernel will fall back to use
+                        xsave to save the states. By using this parameter,
+                        performance of saving the states is degraded because
+                        xsave doesn't support modified optimization while
+                        xsaveopt supports it on xsaveopt enabled systems.
+
+        noxsaves        [X86] Disables xsaves and xrstors used in saving and
+                        restoring x86 extended register state in compacted
+                        form of xsave area. The kernel will fall back to use
+                        xsaveopt and xrstor to save and restore the states
+                        in standard form of xsave area. By using this
+                        parameter, xsave area per process might occupy more
+                        memory on xsaves enabled systems.
+
         eagerfpu=       [X86]
                         on      enable eager fpu restore
                         off     disable eager fpu restore
@@ -2833,6 +2860,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.
 
+        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.
@@ -3049,6 +3083,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         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.
 
@@ -3504,6 +3545,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                         bogus residue values);
                                 s = SINGLE_LUN (the device has only one
                                         Logical Unit);
+                                u = IGNORE_UAS (don't bind to the uas driver);
                                 w = NO_WP_DETECT (don't test whether the
                                         medium is write-protected).
                         Example: quirks=0419:aaf5:rl,0421:0433:rc
@@ -3723,6 +3765,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         Disables the ticketlock slowpath using Xen PV
                         optimizations.
 
+        xen_nopv        [X86]
+                        Disables the PV optimizations forcing the HVM guest to
+                        run as generic HVM guest with no PV drivers.
+
         xirc2ps_cs=     [NET,PCMCIA]
                         Format:
                         <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]