Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 858b6c0b9a15ae71853645013c718dc0398804d4..42379633801f4741a1af5a03c1153b1230d948eb 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -461,6 +461,11 @@
                        possible to determine what the correct size should be.
                        This option provides an override for these situations.
 
+       carrier_timeout=
+                       [NET] Specifies amount of time (in seconds) that
+                       the kernel should wait for a network carrier. By default
+                       it waits 120 seconds.
+
        ca_keys=        [KEYS] This parameter identifies a specific key(s) on
                        the system trusted keyring to be used for certificate
                        trust validation.
@@ -910,6 +915,10 @@
                        The filter can be disabled or changed to another
                        driver later using sysfs.
 
+       driver_async_probe=  [KNL]
+                       List of driver names to be probed asynchronously.
+                       Format: <driver_name1>,<driver_name2>...
+
        drm.edid_firmware=[<connector>:]<file>[,[<connector>:]<file>]
                        Broken monitors, graphic adapters, KVMs and EDIDless
                        panels may send no or incorrect EDID data sets.
@@ -1073,9 +1082,15 @@
                        specified address. The serial port must already be
                        setup and configured. Options are not yet supported.
 
+               efifb,[options]
+                       Start an early, unaccelerated console on the EFI
+                       memory mapped framebuffer (if available). On cache
+                       coherent non-x86 systems that use system memory for
+                       the framebuffer, pass the 'ram' option so that it is
+                       mapped with the correct attributes.
+
        earlyprintk=    [X86,SH,ARM,M68k,S390]
                        earlyprintk=vga
-                       earlyprintk=efi
                        earlyprintk=sclp
                        earlyprintk=xen
                        earlyprintk=serial[,ttySn[,baudrate]]
@@ -2318,6 +2333,10 @@
 
        lsm.debug       [SECURITY] Enable LSM initialization debugging output.
 
+       lsm=lsm1,...,lsmN
+                       [SECURITY] Choose order of LSM initialization. This
+                       overrides CONFIG_LSM, and the "security=" parameter.
+
        machvec=        [IA-64] Force the use of a particular machine-vector
                        (machvec) in a generic kernel.
                        Example: machvec=hpzx1_swiotlb
@@ -3653,19 +3672,6 @@
                        latencies, which will choose a value aligned
                        with the appropriate hardware boundaries.
 
-       rcutree.jiffies_till_sched_qs= [KNL]
-                       Set required age in jiffies for a
-                       given grace period before RCU starts
-                       soliciting quiescent-state help from
-                       rcu_note_context_switch().  If not specified, the
-                       kernel will calculate a value based on the most
-                       recent settings of rcutree.jiffies_till_first_fqs
-                       and rcutree.jiffies_till_next_fqs.
-                       This calculated value may be viewed in
-                       rcutree.jiffies_to_sched_qs.  Any attempt to
-                       set rcutree.jiffies_to_sched_qs will be
-                       cheerfully overwritten.
-
        rcutree.jiffies_till_first_fqs= [KNL]
                        Set delay from grace-period initialization to
                        first attempt to force quiescent states.
@@ -3677,6 +3683,20 @@
                        quiescent states.  Units are jiffies, minimum
                        value is one, and maximum value is HZ.
 
+       rcutree.jiffies_till_sched_qs= [KNL]
+                       Set required age in jiffies for a
+                       given grace period before RCU starts
+                       soliciting quiescent-state help from
+                       rcu_note_context_switch() and cond_resched().
+                       If not specified, the kernel will calculate
+                       a value based on the most recent settings
+                       of rcutree.jiffies_till_first_fqs
+                       and rcutree.jiffies_till_next_fqs.
+                       This calculated value may be viewed in
+                       rcutree.jiffies_to_sched_qs.  Any attempt to set
+                       rcutree.jiffies_to_sched_qs will be cheerfully
+                       overwritten.
+
        rcutree.kthread_prio=    [KNL,BOOT]
                        Set the SCHED_FIFO priority of the RCU per-CPU
                        kthreads (rcuc/N). This value is also used for
@@ -3720,6 +3740,11 @@
                        This wake_up() will be accompanied by a
                        WARN_ONCE() splat and an ftrace_dump().
 
+       rcutree.sysrq_rcu= [KNL]
+                       Commandeer a sysrq key to dump out Tree RCU's
+                       rcu_node tree with an eye towards determining
+                       why a new grace period has not yet started.
+
        rcuperf.gp_async= [KNL]
                        Measure performance of asynchronous
                        grace-period primitives such as call_rcu().
@@ -4089,11 +4114,9 @@
                        Note: increases power consumption, thus should only be
                        enabled if running jitter sensitive (HPC/RT) workloads.
 
-       security=       [SECURITY] Choose a security module to enable at boot.
-                       If this boot parameter is not specified, only the first
-                       security module asking for security registration will be
-                       loaded. An invalid security module name will be treated
-                       as if no module has been chosen.
+       security=       [SECURITY] Choose a legacy "major" security module to
+                       enable at boot. This has been deprecated by the
+                       "lsm=" parameter.
 
        selinux=        [SELINUX] Disable or enable SELinux at boot time.
                        Format: { "0" | "1" }
@@ -4697,7 +4720,8 @@
        usbcore.authorized_default=
                        [USB] Default USB device authorization:
                        (default -1 = authorized except for wireless USB,
-                       0 = not authorized, 1 = authorized)
+                       0 = not authorized, 1 = authorized, 2 = authorized
+                       if device connected to internal port)
 
        usbcore.autosuspend=
                        [USB] The autosuspend time delay (in seconds) used