diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/ABI/stable/sysfs-driver-usb-usbtmc | 14 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-block-rssd | 18 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-cfq-target-latency | 8 | ||||
-rw-r--r-- | Documentation/cgroups/memory.txt | 5 | ||||
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 9 | ||||
-rw-r--r-- | Documentation/filesystems/vfs.txt | 2 | ||||
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 4 | ||||
-rw-r--r-- | Documentation/usb/URB.txt | 22 | ||||
-rw-r--r-- | Documentation/usb/usbmon.txt | 6 |
9 files changed, 73 insertions, 15 deletions
diff --git a/Documentation/ABI/stable/sysfs-driver-usb-usbtmc b/Documentation/ABI/stable/sysfs-driver-usb-usbtmc index 2a7f9a00cb0a..e960cd027e1e 100644 --- a/Documentation/ABI/stable/sysfs-driver-usb-usbtmc +++ b/Documentation/ABI/stable/sysfs-driver-usb-usbtmc | |||
@@ -1,5 +1,5 @@ | |||
1 | What: /sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities | 1 | What: /sys/bus/usb/drivers/usbtmc/*/interface_capabilities |
2 | What: /sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities | 2 | What: /sys/bus/usb/drivers/usbtmc/*/device_capabilities |
3 | Date: August 2008 | 3 | Date: August 2008 |
4 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 4 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
5 | Description: | 5 | Description: |
@@ -12,8 +12,8 @@ Description: | |||
12 | The files are read only. | 12 | The files are read only. |
13 | 13 | ||
14 | 14 | ||
15 | What: /sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities | 15 | What: /sys/bus/usb/drivers/usbtmc/*/usb488_interface_capabilities |
16 | What: /sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities | 16 | What: /sys/bus/usb/drivers/usbtmc/*/usb488_device_capabilities |
17 | Date: August 2008 | 17 | Date: August 2008 |
18 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 18 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
19 | Description: | 19 | Description: |
@@ -27,7 +27,7 @@ Description: | |||
27 | The files are read only. | 27 | The files are read only. |
28 | 28 | ||
29 | 29 | ||
30 | What: /sys/bus/usb/drivers/usbtmc/devices/*/TermChar | 30 | What: /sys/bus/usb/drivers/usbtmc/*/TermChar |
31 | Date: August 2008 | 31 | Date: August 2008 |
32 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 32 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
33 | Description: | 33 | Description: |
@@ -40,7 +40,7 @@ Description: | |||
40 | sent to the device or not. | 40 | sent to the device or not. |
41 | 41 | ||
42 | 42 | ||
43 | What: /sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled | 43 | What: /sys/bus/usb/drivers/usbtmc/*/TermCharEnabled |
44 | Date: August 2008 | 44 | Date: August 2008 |
45 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 45 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
46 | Description: | 46 | Description: |
@@ -51,7 +51,7 @@ Description: | |||
51 | published by the USB-IF. | 51 | published by the USB-IF. |
52 | 52 | ||
53 | 53 | ||
54 | What: /sys/bus/usb/drivers/usbtmc/devices/*/auto_abort | 54 | What: /sys/bus/usb/drivers/usbtmc/*/auto_abort |
55 | Date: August 2008 | 55 | Date: August 2008 |
56 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 56 | Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
57 | Description: | 57 | Description: |
diff --git a/Documentation/ABI/testing/sysfs-block-rssd b/Documentation/ABI/testing/sysfs-block-rssd new file mode 100644 index 000000000000..d535757799fe --- /dev/null +++ b/Documentation/ABI/testing/sysfs-block-rssd | |||
@@ -0,0 +1,18 @@ | |||
1 | What: /sys/block/rssd*/registers | ||
2 | Date: March 2012 | ||
3 | KernelVersion: 3.3 | ||
4 | Contact: Asai Thambi S P <asamymuthupa@micron.com> | ||
5 | Description: This is a read-only file. Dumps below driver information and | ||
6 | hardware registers. | ||
7 | - S ACTive | ||
8 | - Command Issue | ||
9 | - Allocated | ||
10 | - Completed | ||
11 | - PORT IRQ STAT | ||
12 | - HOST IRQ STAT | ||
13 | |||
14 | What: /sys/block/rssd*/status | ||
15 | Date: April 2012 | ||
16 | KernelVersion: 3.4 | ||
17 | Contact: Asai Thambi S P <asamymuthupa@micron.com> | ||
18 | Description: This is a read-only file. Indicates the status of the device. | ||
diff --git a/Documentation/ABI/testing/sysfs-cfq-target-latency b/Documentation/ABI/testing/sysfs-cfq-target-latency new file mode 100644 index 000000000000..df0f7828c5e3 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-cfq-target-latency | |||
@@ -0,0 +1,8 @@ | |||
1 | What: /sys/block/<device>/iosched/target_latency | ||
2 | Date: March 2012 | ||
3 | contact: Tao Ma <boyu.mt@taobao.com> | ||
4 | Description: | ||
5 | The /sys/block/<device>/iosched/target_latency only exists | ||
6 | when the user sets cfq to /sys/block/<device>/scheduler. | ||
7 | It contains an estimated latency time for the cfq. cfq will | ||
8 | use it to calculate the time slice used for every task. | ||
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 4c95c0034a4b..9b1067afb224 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt | |||
@@ -34,8 +34,7 @@ Current Status: linux-2.6.34-mmotm(development version of 2010/April) | |||
34 | 34 | ||
35 | Features: | 35 | Features: |
36 | - accounting anonymous pages, file caches, swap caches usage and limiting them. | 36 | - accounting anonymous pages, file caches, swap caches usage and limiting them. |
37 | - private LRU and reclaim routine. (system's global LRU and private LRU | 37 | - pages are linked to per-memcg LRU exclusively, and there is no global LRU. |
38 | work independently from each other) | ||
39 | - optionally, memory+swap usage can be accounted and limited. | 38 | - optionally, memory+swap usage can be accounted and limited. |
40 | - hierarchical accounting | 39 | - hierarchical accounting |
41 | - soft limit | 40 | - soft limit |
@@ -154,7 +153,7 @@ updated. page_cgroup has its own LRU on cgroup. | |||
154 | 2.2.1 Accounting details | 153 | 2.2.1 Accounting details |
155 | 154 | ||
156 | All mapped anon pages (RSS) and cache pages (Page Cache) are accounted. | 155 | All mapped anon pages (RSS) and cache pages (Page Cache) are accounted. |
157 | Some pages which are never reclaimable and will not be on the global LRU | 156 | Some pages which are never reclaimable and will not be on the LRU |
158 | are not accounted. We just account pages under usual VM management. | 157 | are not accounted. We just account pages under usual VM management. |
159 | 158 | ||
160 | RSS pages are accounted at page_fault unless they've already been accounted | 159 | RSS pages are accounted at page_fault unless they've already been accounted |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index d6dd84fbea84..223fe9fcfd94 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -534,7 +534,16 @@ Who: Kees Cook <keescook@chromium.org> | |||
534 | 534 | ||
535 | ---------------------------- | 535 | ---------------------------- |
536 | 536 | ||
537 | What: setitimer accepts user NULL pointer (value) | ||
538 | When: 3.6 | ||
539 | Why: setitimer is not returning -EFAULT if user pointer is NULL. This | ||
540 | violates the spec. | ||
541 | Who: Sasikantha Babu <sasikanth.v19@gmail.com> | ||
542 | |||
543 | ---------------------------- | ||
544 | |||
537 | What: KVM debugfs statistics | 545 | What: KVM debugfs statistics |
538 | When: 2013 | 546 | When: 2013 |
539 | Why: KVM tracepoints provide mostly equivalent information in a much more | 547 | Why: KVM tracepoints provide mostly equivalent information in a much more |
540 | flexible fashion. | 548 | flexible fashion. |
549 | |||
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index e916e3d36488..0d0492028082 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
@@ -114,7 +114,7 @@ members are defined: | |||
114 | struct file_system_type { | 114 | struct file_system_type { |
115 | const char *name; | 115 | const char *name; |
116 | int fs_flags; | 116 | int fs_flags; |
117 | struct dentry (*mount) (struct file_system_type *, int, | 117 | struct dentry *(*mount) (struct file_system_type *, int, |
118 | const char *, void *); | 118 | const char *, void *); |
119 | void (*kill_sb) (struct super_block *); | 119 | void (*kill_sb) (struct super_block *); |
120 | struct module *owner; | 120 | struct module *owner; |
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index d97d992ced14..03f7897c6414 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -43,7 +43,9 @@ ALC680 | |||
43 | 43 | ||
44 | ALC882/883/885/888/889 | 44 | ALC882/883/885/888/889 |
45 | ====================== | 45 | ====================== |
46 | N/A | 46 | acer-aspire-4930g Acer Aspire 4930G/5930G/6530G/6930G/7730G |
47 | acer-aspire-8930g Acer Aspire 8330G/6935G | ||
48 | acer-aspire Acer Aspire others | ||
47 | 49 | ||
48 | ALC861/660 | 50 | ALC861/660 |
49 | ========== | 51 | ========== |
diff --git a/Documentation/usb/URB.txt b/Documentation/usb/URB.txt index 8ffce746d496..00d2c644068e 100644 --- a/Documentation/usb/URB.txt +++ b/Documentation/usb/URB.txt | |||
@@ -168,6 +168,28 @@ that if the completion handler or anyone else tries to resubmit it | |||
168 | they will get a -EPERM error. Thus you can be sure that when | 168 | they will get a -EPERM error. Thus you can be sure that when |
169 | usb_kill_urb() returns, the URB is totally idle. | 169 | usb_kill_urb() returns, the URB is totally idle. |
170 | 170 | ||
171 | There is a lifetime issue to consider. An URB may complete at any | ||
172 | time, and the completion handler may free the URB. If this happens | ||
173 | while usb_unlink_urb or usb_kill_urb is running, it will cause a | ||
174 | memory-access violation. The driver is responsible for avoiding this, | ||
175 | which often means some sort of lock will be needed to prevent the URB | ||
176 | from being deallocated while it is still in use. | ||
177 | |||
178 | On the other hand, since usb_unlink_urb may end up calling the | ||
179 | completion handler, the handler must not take any lock that is held | ||
180 | when usb_unlink_urb is invoked. The general solution to this problem | ||
181 | is to increment the URB's reference count while holding the lock, then | ||
182 | drop the lock and call usb_unlink_urb or usb_kill_urb, and then | ||
183 | decrement the URB's reference count. You increment the reference | ||
184 | count by calling | ||
185 | |||
186 | struct urb *usb_get_urb(struct urb *urb) | ||
187 | |||
188 | (ignore the return value; it is the same as the argument) and | ||
189 | decrement the reference count by calling usb_free_urb. Of course, | ||
190 | none of this is necessary if there's no danger of the URB being freed | ||
191 | by the completion handler. | ||
192 | |||
171 | 193 | ||
172 | 1.7. What about the completion handler? | 194 | 1.7. What about the completion handler? |
173 | 195 | ||
diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt index 5335fa8b06eb..c42bb9cd3b43 100644 --- a/Documentation/usb/usbmon.txt +++ b/Documentation/usb/usbmon.txt | |||
@@ -183,10 +183,10 @@ An input control transfer to get a port status. | |||
183 | d5ea89a0 3575914555 S Ci:1:001:0 s a3 00 0000 0003 0004 4 < | 183 | d5ea89a0 3575914555 S Ci:1:001:0 s a3 00 0000 0003 0004 4 < |
184 | d5ea89a0 3575914560 C Ci:1:001:0 0 4 = 01050000 | 184 | d5ea89a0 3575914560 C Ci:1:001:0 0 4 = 01050000 |
185 | 185 | ||
186 | An output bulk transfer to send a SCSI command 0x5E in a 31-byte Bulk wrapper | 186 | An output bulk transfer to send a SCSI command 0x28 (READ_10) in a 31-byte |
187 | to a storage device at address 5: | 187 | Bulk wrapper to a storage device at address 5: |
188 | 188 | ||
189 | dd65f0e8 4128379752 S Bo:1:005:2 -115 31 = 55534243 5e000000 00000000 00000600 00000000 00000000 00000000 000000 | 189 | dd65f0e8 4128379752 S Bo:1:005:2 -115 31 = 55534243 ad000000 00800000 80010a28 20000000 20000040 00000000 000000 |
190 | dd65f0e8 4128379808 C Bo:1:005:2 0 31 > | 190 | dd65f0e8 4128379808 C Bo:1:005:2 0 31 > |
191 | 191 | ||
192 | * Raw binary format and API | 192 | * Raw binary format and API |