diff options
author | Greg Kroah-Hartman | 2013-08-04 23:41:03 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-08-04 23:41:03 +0200 |
commit | 5ac1ccb70a3b7d4627c257fcbb2579b2dc4d2a0a (patch) | |
tree | 57c9fc4aae86d6dc4dacb921e673ac6b0deac26d /Documentation | |
parent | serial: st-asc: Fix unused variable warning for non DT. (diff) | |
parent | Linux 3.11-rc4 (diff) | |
download | kernel-qcow2-linux-5ac1ccb70a3b7d4627c257fcbb2579b2dc4d2a0a.tar.gz kernel-qcow2-linux-5ac1ccb70a3b7d4627c257fcbb2579b2dc4d2a0a.tar.xz kernel-qcow2-linux-5ac1ccb70a3b7d4627c257fcbb2579b2dc4d2a0a.zip |
Merge 3.11-rc4 into tty-next
We want the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 2 | ||||
-rw-r--r-- | Documentation/sysctl/net.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index cbfdf5486639..fe397f90a34f 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -84,7 +84,7 @@ X!Iinclude/linux/kobject.h <sect1><title>Kernel utility functions</title> !Iinclude/linux/kernel.h -!Ekernel/printk.c +!Ekernel/printk/printk.c !Ekernel/panic.c !Ekernel/sys.c !Ekernel/rcupdate.c diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt index 1c15043aaee4..d569f2a424d5 100644 --- a/Documentation/sysctl/net.txt +++ b/Documentation/sysctl/net.txt @@ -52,7 +52,7 @@ Default: 64 busy_read ---------------- -Low latency busy poll timeout for socket reads. (needs CONFIG_NET_LL_RX_POLL) +Low latency busy poll timeout for socket reads. (needs CONFIG_NET_RX_BUSY_POLL) Approximate time in us to busy loop waiting for packets on the device queue. This sets the default value of the SO_BUSY_POLL socket option. Can be set or overridden per socket by setting socket option SO_BUSY_POLL, @@ -63,7 +63,7 @@ Default: 0 (off) busy_poll ---------------- -Low latency busy poll timeout for poll and select. (needs CONFIG_NET_LL_RX_POLL) +Low latency busy poll timeout for poll and select. (needs CONFIG_NET_RX_BUSY_POLL) Approximate time in us to busy loop waiting for events. Recommended value depends on the number of sockets you poll on. For several sockets 50, for several hundreds 100. |