Merge branch 'for-4.12/asus' into for-linus

[mirror_ubuntu-artful-kernel.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 14ffef04113c096f9ce2840bf8c0485c81e3e86a..0464a41cbf3bd37a37695db8526834ab8df6ef9a 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -653,6 +653,9 @@
        cpuidle.off=1   [CPU_IDLE]
                        disable the cpuidle sub-system
 
+       cpufreq.off=1   [CPU_FREQ]
+                       disable the cpufreq sub-system
+
        cpu_init_udelay=N
                        [X86] Delay for N microsec between assert and de-assert
                        of APIC INIT to start processors.  This delay occurs
@@ -957,6 +960,12 @@
                        serial port must already be setup and configured.
                        Options are not yet supported.
 
+               lantiq,<addr>
+                       Start an early, polled-mode console on a lantiq serial
+                       (lqasc) port at the specified address. The serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+
                lpuart,<addr>
                lpuart32,<addr>
                        Use early console provided by Freescale LP UART driver
@@ -970,9 +979,10 @@
                        address. The serial port must already be setup
                        and configured. Options are not yet supported.
 
-       earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]
+       earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k,S390]
                        earlyprintk=vga
                        earlyprintk=efi
+                       earlyprintk=sclp
                        earlyprintk=xen
                        earlyprintk=serial[,ttySn[,baudrate]]
                        earlyprintk=serial[,0x...[,baudrate]]
@@ -1007,6 +1017,8 @@
 
                        The xen output can only be used by Xen PV guests.
 
+                       The sclp output can only be used on s390.
+
        edac_report=    [HW,EDAC] Control how to report EDAC event
                        Format: {"on" | "off" | "force"}
                        on: enable EDAC to report H/W event. May be overridden
@@ -1174,6 +1186,12 @@
                        functions that can be changed at run time by the
                        set_graph_notrace file in the debugfs tracing directory.
 
+       ftrace_graph_max_depth=<uint>
+                       [FTRACE] Used with the function graph tracer. This is
+                       the max depth it will trace into a function. This value
+                       can be changed at run time by the max_graph_depth file
+                       in the tracefs tracing directory. default: 0 (no limit)
+
        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
                        support via parallel port (up to 5 devices per port)
@@ -1192,6 +1210,10 @@
                        When zero, profiling data is discarded and associated
                        debugfs files are removed at module unload time.
 
+       goldfish        [X86] Enable the goldfish android emulator platform.
+                       Don't use this when you are not running on the
+                       android emulator
+
        gpt             [EFI] Forces disk with valid GPT signature but
                        invalid Protective MBR to be treated as GPT. If the
                        primary GPT is corrupted, it enables the backup/alternate
@@ -3681,6 +3703,14 @@
                        last alloc / free. For more information see
                        Documentation/vm/slub.txt.
 
+       slub_memcg_sysfs=       [MM, SLUB]
+                       Determines whether to enable sysfs directories for
+                       memory cgroup sub-caches. 1 to enable, 0 to disable.
+                       The default is determined by CONFIG_SLUB_MEMCG_SYSFS_ON.
+                       Enabling this can lead to a very high number of debug
+                       directories and files being created under
+                       /sys/kernel/slub.
+
        slub_max_order= [MM, SLUB]
                        Determines the maximum allowed order for slabs.
                        A high setting may cause OOMs due to memory