tracing/mm: Move include of trace/events/kmem.h out of header into slab.c

[mirror_ubuntu-bionic-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0293fc8daca34ab9e3055d534bcc5aebc0dc91d6..7b2e5c5eefa60269e0311d2685bd28b10c1e22cc 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2637,6 +2637,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        [USB] Start with the old device initialization
                        scheme (default 0 = off).
 
+       usbcore.usbfs_memory_mb=
+                       [USB] Memory limit (in MB) for buffers allocated by
+                       usbfs (default = 16, 0 = max = 2047).
+
        usbcore.use_both_schemes=
                        [USB] Try the other device initialization scheme
                        if the first one fails (default 1 = enabled).
@@ -2755,11 +2759,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        functions are at fixed addresses, they make nice
                        targets for exploits that can control RIP.
 
-                       emulate     Vsyscalls turn into traps and are emulated
-                                   reasonably safely.
+                       emulate     [default] Vsyscalls turn into traps and are
+                                   emulated reasonably safely.
 
-                       native      [default] Vsyscalls are native syscall
-                                   instructions.
+                       native      Vsyscalls are native syscall instructions.
                                    This is a little bit faster than trapping
                                    and makes a few dynamic recompilers work
                                    better than they would in emulation mode.