Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 7936b80..cb3a169 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1503,6 +1503,14 @@ and is between 256 and 4096 characters. It is defined in the file
                        [NFS] set the TCP port on which the NFSv4 callback
                        channel should listen.
 
+       nfs.cache_getent=
+                       [NFS] sets the pathname to the program which is used
+                       to update the NFS client cache entries.
+
+       nfs.cache_getent_timeout=
+                       [NFS] sets the timeout after which an attempt to
+                       update a cache entry is deemed to have failed.
+
        nfs.idmap_cache_timeout=
                        [NFS] set the maximum lifetime for idmapper cache
                        entries.
@@ -1535,6 +1543,11 @@ and is between 256 and 4096 characters. It is defined in the file
                        symbolic names: lapic and ioapic
                        Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
 
+       netpoll.carrier_timeout=
+                       [NET] Specifies amount of time (in seconds) that
+                       netpoll should wait for a carrier. By default netpoll
+                       waits 4 seconds.
+
        no387           [BUGS=X86-32] Tells the kernel to use the 387 maths
                        emulation library even if a 387 maths coprocessor
                        is present.
@@ -2395,6 +2408,18 @@ and is between 256 and 4096 characters. It is defined in the file
        stifb=          [HW]
                        Format: bpp:<bpp1>[:<bpp2>[:<bpp3>...]]
 
+       sunrpc.min_resvport=
+       sunrpc.max_resvport=
+                       [NFS,SUNRPC]
+                       SunRPC servers often require that client requests
+                       originate from a privileged port (i.e. a port in the
+                       range 0 < portnr < 1024).
+                       An administrator who wishes to reserve some of these
+                       ports for other uses may adjust the range that the
+                       kernel's sunrpc client considers to be privileged
+                       using these two parameters to set the minimum and
+                       maximum port values.
+
        sunrpc.pool_mode=
                        [NFS]
                        Control how the NFS server code allocates CPUs to
@@ -2411,6 +2436,15 @@ and is between 256 and 4096 characters. It is defined in the file
                        pernode     one pool for each NUMA node (equivalent
                                    to global on non-NUMA machines)
 
+       sunrpc.tcp_slot_table_entries=
+       sunrpc.udp_slot_table_entries=
+                       [NFS,SUNRPC]
+                       Sets the upper limit on the number of simultaneous
+                       RPC calls that can be sent from the client to a
+                       server. Increasing these values may allow you to
+                       improve throughput, but will also increase the
+                       amount of memory reserved for use by the client.
+
        swiotlb=        [IA-64] Number of I/O TLB slabs
 
        switches=       [HW,M68k]
@@ -2480,6 +2514,11 @@ and is between 256 and 4096 characters. It is defined in the file
        trace_buf_size=nn[KMG]
                        [FTRACE] will set tracing buffer size.
 
+       trace_event=[event-list]
+                       [FTRACE] Set and start specified trace events in order
+                       to facilitate early boot debugging.
+                       See also Documentation/trace/events.txt
+
        trix=           [HW,OSS] MediaTrix AudioTrix Pro
                        Format:
                        <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>