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
index 91c0251fdb8664ad40c8f808203299f1c795ac7f..42379633801f4741a1af5a03c1153b1230d948eb 100644 (file)
                        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.
                        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.
                        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]]
                        By default, super page will be supported if Intel IOMMU
                        has the capability. With this option, super page will
                        not be supported.
-               sm_off [Default Off]
-                       By default, scalable mode will be supported if the
+               sm_on [Default Off]
+                       By default, scalable mode will be disabled even if the
                        hardware advertises that it has support for the scalable
                        mode translation. With this option set, scalable mode
-                       will not be used even on hardware which claims to support
-                       it.
+                       will be used on hardware which claims to support it.
                tboot_noforce [Default Off]
                        Do not force the Intel IOMMU enabled under tboot.
                        By default, tboot will force Intel IOMMU on, which
                        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.
                        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
                        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().
        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