Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 534a76ad53677148198738f4c5aeba002746afad..4e0654b56aefad77c4f84c64d7e140b58df86fb3 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -531,7 +531,6 @@
                        [ACPI] acpi_pm
                        [ARM] imx_timer1,OSTS,netx_timer,mpu_timer2,
                                pxa_timer,timer3,32k_counter,timer0_1
-                       [AVR32] avr32
                        [X86-32] pit,hpet,tsc;
                                scx200_hrt on Geode; cyclone on IBM x440
                        [MIPS] MIPS
@@ -989,6 +988,7 @@
                        earlyprintk=ttySn[,baudrate]
                        earlyprintk=dbgp[debugController#]
                        earlyprintk=pciserial,bus:device.function[,baudrate]
+                       earlyprintk=xdbc[xhciController#]
 
                        earlyprintk is useful when the kernel crashes before
                        the normal console is initialized. It is not enabled by
@@ -2440,7 +2440,7 @@
                        osd-targets. Please see:
                        Documentation/filesystems/pnfs.txt for more explanations
 
-       nmi_debug=      [KNL,AVR32,SH] Specify one or more actions to take
+       nmi_debug=      [KNL,SH] Specify one or more actions to take
                        when a NMI is triggered.
                        Format: [state][,regs][,debounce][,die]
 
@@ -3193,6 +3193,12 @@
        ramdisk_size=   [RAM] Sizes of RAM disks in kilobytes
                        See Documentation/blockdev/ramdisk.txt.
 
+       ras=option[,option,...] [KNL] RAS-specific options
+
+               cec_disable     [X86]
+                               Disable the Correctable Errors Collector,
+                               see CONFIG_RAS_CEC help text.
+
        rcu_nocbs=      [KNL]
                        The argument is a cpu list, as described above.
 
@@ -3794,6 +3800,14 @@
        spia_pedr=
        spia_peddr=
 
+       srcutree.exp_holdoff [KNL]
+                       Specifies how many nanoseconds must elapse
+                       since the end of the last SRCU grace period for
+                       a given srcu_struct until the next normal SRCU
+                       grace period will be considered for automatic
+                       expediting.  Set to zero to disable automatic
+                       expediting.
+
        stacktrace      [FTRACE]
                        Enabled the stack tracer on boot up.
 
@@ -4136,6 +4150,9 @@
        usbhid.mousepoll=
                        [USBHID] The interval which mice are to be polled at.
 
+       usbhid.jspoll=
+                       [USBHID] The interval which joysticks are to be polled at.
+
        usb-storage.delay_use=
                        [UMS] The delay in seconds before a new device is
                        scanned for Logical Units (default 1).