Merge branch 'pm-cpufreq'

[karo-tx-linux.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 3988d2311f9707c48b4f3dca5df1c333ef0972cf..41851d42b84d1ba89774a7c6d61c2ce9ce601f34 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -549,15 +549,6 @@
                        loops can be debugged more effectively on production
                        systems.
 
-       clocksource.arm_arch_timer.fsl-a008585=
-                       [ARM64]
-                       Format: <bool>
-                       Enable/disable the workaround of Freescale/NXP
-                       erratum A-008585.  This can be useful for KVM
-                       guests, if the guest device tree doesn't show the
-                       erratum.  If unspecified, the workaround is
-                       enabled based on the device tree.
-
        clearcpuid=BITNUM [X86]
                        Disable CPUID feature X for the kernel. See
                        arch/x86/include/asm/cpufeatures.h for the valid bit
@@ -969,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
@@ -982,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]]
@@ -1019,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
@@ -1204,6 +1204,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
@@ -3281,6 +3285,13 @@
                        Lazy RCU callbacks are those which RCU can
                        prove do nothing more than free memory.
 
+       rcutree.rcu_kick_kthreads= [KNL]
+                       Cause the grace-period kthread to get an extra
+                       wake_up() if it sleeps three times longer than
+                       it should at force-quiescent-state time.
+                       This wake_up() will be accompanied by a
+                       WARN_ONCE() splat and an ftrace_dump().
+
        rcuperf.gp_exp= [KNL]
                        Measure performance of expedited synchronous
                        grace-period primitives.
@@ -3566,6 +3577,10 @@
        rhash_entries=  [KNL,NET]
                        Set number of hash buckets for route cache
 
+       ring3mwait=disable
+                       [KNL] Disable ring 3 MONITOR/MWAIT feature on supported
+                       CPUs.
+
        ro              [KNL] Mount root device read-only on boot
 
        rodata=         [KNL]
@@ -3682,6 +3697,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