Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 7f084b764fb9308b4e8f2d47d520eeae743a0502..247dcfd62034612e09dce56d6d6fffff4f0c957a 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -965,7 +965,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                             controller
        i8042.nopnp     [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
                             controllers
-       i8042.notimeout [HW] Ignore timeout condition signalled by conroller
+       i8042.notimeout [HW] Ignore timeout condition signalled by controller
        i8042.reset     [HW] Reset the controller during init and cleanup
        i8042.unlock    [HW] Unlock (ignore) the keylock
 
@@ -2455,7 +2455,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        For more information see Documentation/vm/slub.txt.
 
        slub_min_order= [MM, SLUB]
-                       Determines the mininum page order for slabs. Must be
+                       Determines the minimum page order for slabs. Must be
                        lower than slub_max_order.
                        For more information see Documentation/vm/slub.txt.
 
@@ -2621,7 +2621,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        threadirqs      [KNL]
                        Force threading of all interrupt handlers except those
-                       marked explicitely IRQF_NO_THREAD.
+                       marked explicitly IRQF_NO_THREAD.
 
        topology=       [S390]
                        Format: {off | on}
@@ -2650,6 +2650,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        to facilitate early boot debugging.
                        See also Documentation/trace/events.txt
 
+       transparent_hugepage=
+                       [KNL]
+                       Format: [always|madvise|never]
+                       Can be used to control the default behavior of the system
+                       with respect to transparent hugepages.
+                       See Documentation/vm/transhuge.txt for more details.
+
        tsc=            Disable clocksource stability checks for TSC.
                        Format: <string>
                        [x86] reliable: mark tsc clocksource as reliable, this