Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git] / Documentation / kernel-parameters.txt
index aa0eedc84d003361a8f69ade977e37f95baf8ffe..04e9f5505faa8fa4133c198a946cdefab241824d 100644 (file)
@@ -656,7 +656,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Sets the size of kernel global memory area for
                        contiguous memory allocations and optionally the
                        placement constraint by the physical address range of
-                       memory allocations. For more information, see
+                       memory allocations. A value of 0 disables CMA
+                       altogether. For more information, see
                        include/linux/dma-contiguous.h
 
        cmo_free_hint=  [PPC] Format: { yes | no }
@@ -921,6 +922,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        earlycon=       [KNL] Output early console device and options.
 
+               cdns,<addr>
+                       Start an early, polled-mode console on a cadence serial
+                       port at the specified address. The cadence serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+
                uart[8250],io,<addr>[,options]
                uart[8250],mmio,<addr>[,options]
                uart[8250],mmio32,<addr>[,options]
@@ -936,6 +943,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        must already be setup and configured. Options are not
                        yet supported.
 
+               msm_serial,<addr>
+                       Start an early, polled-mode console on an msm serial
+                       port at the specified address. The serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+
+               msm_serial_dm,<addr>
+                       Start an early, polled-mode console on an msm serial
+                       dm port at the specified address. The serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+
                smh     Use ARM semihosting calls for early console.
 
        earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]
@@ -1304,7 +1323,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Set number of hash buckets for inode cache.
 
        ima_appraise=   [IMA] appraise integrity measurements
-                       Format: { "off" | "enforce" | "fix" }
+                       Format: { "off" | "enforce" | "fix" | "log" }
                        default: "enforce"
 
        ima_appraise_tcb [IMA]
@@ -3206,6 +3225,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        slram=          [HW,MTD]
 
+       slab_nomerge    [MM]
+                       Disable merging of slabs with similar size. May be
+                       necessary if there is some reason to distinguish
+                       allocs to different slabs. Debug options disable
+                       merging on their own.
+                       For more information see Documentation/vm/slub.txt.
+
        slab_max_order= [MM, SLAB]
                        Determines the maximum allowed order for slabs.
                        A high setting may cause OOMs due to memory
@@ -3241,11 +3267,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        For more information see Documentation/vm/slub.txt.
 
        slub_nomerge    [MM, SLUB]
-                       Disable merging of slabs with similar size. May be
-                       necessary if there is some reason to distinguish
-                       allocs to different slabs. Debug options disable
-                       merging on their own.
-                       For more information see Documentation/vm/slub.txt.
+                       Same with slab_nomerge. This is supported for legacy.
+                       See slab_nomerge for more information.
 
        smart2=         [HW]
                        Format: <io1>[,<io2>[,...,<io8>]]
@@ -3369,11 +3392,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        tdfx=           [HW,DRM]
 
-       test_suspend=   [SUSPEND]
+       test_suspend=   [SUSPEND][,N]
                        Specify "mem" (for Suspend-to-RAM) or "standby" (for
-                       standby suspend) as the system sleep state to briefly
-                       enter during system startup.  The system is woken from
-                       this state using a wakeup-capable RTC alarm.
+                       standby suspend) or "freeze" (for suspend type freeze)
+                       as the system sleep state during system startup with
+                       the optional capability to repeat N number of times.
+                       The system is woken from this state using a
+                       wakeup-capable RTC alarm.
 
        thash_entries=  [KNL,NET]
                        Set number of hash buckets for TCP connection
@@ -3588,6 +3613,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        READ_DISC_INFO command);
                                e = NO_READ_CAPACITY_16 (don't use
                                        READ_CAPACITY_16 command);
+                               f = NO_REPORT_OPCODES (don't use report opcodes
+                                       command, uas only);
                                h = CAPACITY_HEURISTICS (decrease the
                                        reported device capacity by one
                                        sector if the number is odd);
@@ -3607,6 +3634,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        bogus residue values);
                                s = SINGLE_LUN (the device has only one
                                        Logical Unit);
+                               t = NO_ATA_1X (don't allow ATA(12) and ATA(16)
+                                       commands, uas only);
                                u = IGNORE_UAS (don't bind to the uas driver);
                                w = NO_WP_DETECT (don't test whether the
                                        medium is write-protected).
This page took 0.028099 seconds and 5 git commands to generate.