mlx4_core: Improve error message when not enough UAR pages are available

[linux-2.6-omap-h63xx.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 09ad7450647bc81dff32a3eaf7ea3c0858f4a896..30d44b78171a53e5dcc9e3b42d67266f61975a75 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1206,7 +1206,7 @@ and is between 256 and 4096 characters. It is defined in the file
                                 or
                                 memmap=0x10000$0x18690000
 
                                 or
                                 memmap=0x10000$0x18690000
 

-       memtest=        [KNL,X86_64] Enable memtest
+       memtest=        [KNL,X86] Enable memtest

                        Format: <integer>
                        range: 0,4 : pattern number
                        default : 0 <disable>
                        Format: <integer>
                        range: 0,4 : pattern number
                        default : 0 <disable>


@@ -1279,6 +1279,13 @@ and is between 256 and 4096 characters. It is defined in the file
                        This usage is only documented in each driver source
                        file if at all.
 
                        This usage is only documented in each driver source
                        file if at all.
 

+       nf_conntrack.acct=
+                       [NETFILTER] Enable connection tracking flow accounting
+                       0 to disable accounting
+                       1 to enable accounting
+                       Default value depends on CONFIG_NF_CT_ACCT that is
+                       going to be removed in 2.6.29.
+

        nfsaddrs=       [NFS]
                        See Documentation/filesystems/nfsroot.txt.
 
        nfsaddrs=       [NFS]
                        See Documentation/filesystems/nfsroot.txt.
 


@@ -2158,6 +2165,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        Note that genuine overcurrent events won't be
                        reported either.
 
                        Note that genuine overcurrent events won't be
                        reported either.
 

+       unknown_nmi_panic
+                       [X86-32,X86-64]
+                       Set unknown_nmi_panic=1 early on boot.
+

        usbcore.autosuspend=
                        [USB] The autosuspend time delay (in seconds) used
                        for newly-detected USB devices (default 2).  This
        usbcore.autosuspend=
                        [USB] The autosuspend time delay (in seconds) used
                        for newly-detected USB devices (default 2).  This