1 files changed, 51 insertions, 29 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 3078f14830dd..8363ad3ba018 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -237,16 +237,9 @@ and is between 256 and 4096 characters. It is defined in the file
                         Disable PIN 1 of APIC timer
                         Can be useful to work around chipset bugs.
 
-        ad1816=         [HW,OSS]
-                        Format: <io>,<irq>,<dma>,<dma2>
-                        See also Documentation/sound/oss/AD1816.
-
         ad1848=         [HW,OSS]
                         Format: <io>,<irq>,<dma>,<dma2>,<type>
 
-        adlib=          [HW,OSS]
-                        Format: <io>
-
         advansys=       [HW,SCSI]
                         See header of drivers/scsi/advansys.c.
 
@@ -451,13 +444,20 @@ and is between 256 and 4096 characters. It is defined in the file
                         Documentation/networking/netconsole.txt for an
                         alternative.
 
-                uart,io,<addr>[,options]
-                uart,mmio,<addr>[,options]
+                uart[8250],io,<addr>[,options]
+                uart[8250],mmio,<addr>[,options]
                         Start an early, polled-mode console on the 8250/16550
                         UART at the specified I/O port or MMIO address,
                         switching to the matching ttyS device later.  The
                         options are the same as for ttyS, above.
 
+        earlycon=       [KNL] Output early console device and options.
+                uart[8250],io,<addr>[,options]
+                uart[8250],mmio,<addr>[,options]
+                        Start an early, polled-mode console on the 8250/16550
+                        UART at the specified I/O port or MMIO address.
+                        The options are the same as for ttyS, above.
+
         cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver
                         Format:
                         <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
@@ -1159,6 +1159,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nosmp           [SMP] Tells an SMP kernel to act as a UP kernel.
 
+        nosoftlockup    [KNL] Disable the soft-lockup detector.
+
         nosync          [HW,M68K] Disables sync negotiation for all devices.
 
         notsc           [BUGS=IA-32] Disable Time Stamp Counter
@@ -1167,14 +1169,16 @@ and is between 256 and 4096 characters. It is defined in the file
 
         nowb            [ARM]
 
+        numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA.
+                        one of ['zone', 'node', 'default'] can be specified
+                        This can be set from sysctl after boot.
+                        See Documentation/sysctl/vm.txt for details.
+
         nr_uarts=       [SERIAL] maximum number of UARTs to be registered.
 
         opl3=           [HW,OSS]
                         Format: <io>
 
-        opl3sa2=        [HW,OSS] Format:
-                        <io>,<irq>,<dma>,<dma2>,<mss_io>,<mpu_io>,<ymode>,<loopback>[,<isapnp>,<multiple]
-
         oprofile.timer= [HW]
                         Use timer interrupt instead of performance counters
 
@@ -1356,6 +1360,15 @@ and is between 256 and 4096 characters. It is defined in the file
                         autoconfiguration.
                         Ranges are in pairs (memory base and size).
 
+        print-fatal-signals=
+                        [KNL] debug: print fatal signals
+                        print-fatal-signals=1: print segfault info to
+                        the kernel console.
+                        default: off.
+
+        printk.time=    Show timing data prefixed to each printk message line
+                        Format: <bool>  (1/Y/y=enable, 0/N/n=disable)
+
         profile=        [KNL] Enable kernel profiling via /proc/profile
                         Format: [schedule,]<number>
                         Param: "schedule" - profile schedule points.
@@ -1468,6 +1481,10 @@ and is between 256 and 4096 characters. It is defined in the file
 
         rootfstype=     [KNL] Set root filesystem type
 
+        rootwait        [KNL] Wait (indefinitely) for root device to show up.
+                        Useful for devices that are detected asynchronously
+                        (e.g. USB and MMC devices).
+
         rw              [KNL] Mount root device read-write on boot
 
         S               [KNL] Run init in single mode
@@ -1534,35 +1551,39 @@ and is between 256 and 4096 characters. It is defined in the file
 
         slram=          [HW,MTD]
 
-        slub_debug      [MM, SLUB]
-                        Enabling slub_debug allows one to determine the culprit
-                        if slab objects become corrupted. Enabling slub_debug
-                        creates guard zones around objects and poisons objects
-                        when not in use. Also tracks the last alloc / free.
-                        For more information see Documentation/vm/slub.txt.
+        slub_debug[=options[,slabs]]    [MM, SLUB]
+                        Enabling slub_debug allows one to determine the
+                        culprit if slab objects become corrupted. Enabling
+                        slub_debug can create guard zones around objects and
+                        may poison objects when not in use. Also tracks the
+                        last alloc / free. For more information see
+                        Documentation/vm/slub.txt.
 
         slub_max_order= [MM, SLUB]
-                        Determines the maximum allowed order for slabs. Setting
-                        this too high may cause fragmentation.
-                        For more information see Documentation/vm/slub.txt.
+                        Determines the maximum allowed order for slabs.
+                        A high setting may cause OOMs due to memory
+                        fragmentation. For more information see
+                        Documentation/vm/slub.txt.
 
         slub_min_objects=       [MM, SLUB]
-                        The minimum objects per slab. SLUB will increase the
-                        slab order up to slub_max_order to generate a
-                        sufficiently big slab to satisfy the number of objects.
-                        The higher the number of objects the smaller the overhead
-                        of tracking slabs.
+                        The minimum number of objects per slab. SLUB will
+                        increase the slab order up to slub_max_order to
+                        generate a sufficiently large slab able to contain
+                        the number of objects indicated. The higher the number
+                        of objects the smaller the overhead of tracking slabs
+                        and the less frequently locks need to be acquired.
                         For more information see Documentation/vm/slub.txt.
 
         slub_min_order= [MM, SLUB]
                         Determines the mininum page order for slabs. Must be
-                        lower than slub_max_order
+                        lower than slub_max_order.
                         For more information see Documentation/vm/slub.txt.
 
         slub_nomerge    [MM, SLUB]
-                        Disable merging of slabs of similar size. May be
+                        Disable merging of slabs with similar size. May be
                         necessary if there is some reason to distinguish
-                        allocs to different slabs.
+                        allocs to different slabs. Debug options disable
+                        merging on their own.
                         For more information see Documentation/vm/slub.txt.
 
         smart2=         [HW]
@@ -1775,6 +1796,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         Set number of hash buckets for TCP connection
 
         time            Show timing data prefixed to each printk message line
+                        [deprecated, see 'printk.time']
 
         tipar.timeout=  [HW,PPT]
                         Set communications timeout in tenths of a second