Skip to content

Commit 8f98776

Browse files
author
Liam Girdwood
committed
Merge commit 'v2.6.37-rc1' into for-2.6.37
2 parents 63f7526 + c8ddb27 commit 8f98776

File tree

10,556 files changed

+999059
-568098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,556 files changed

+999059
-568098
lines changed

‎CREDITS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3554,12 +3554,12 @@ E: [email protected]
35543554
D: portions of the Linux Security Module (LSM) framework and security modules
35553555

35563556
N: Petr Vandrovec
3557-
E: [email protected]
3557+
E: [email protected]
35583558
D: Small contributions to ncpfs
35593559
D: Matrox framebuffer driver
3560-
S: Chudenicka 8
3561-
S: 10200 Prague 10, Hostivar
3562-
S: Czech Republic
3560+
S: 21513 Conradia Ct
3561+
S: Cupertino, CA 95014
3562+
S: USA
35633563

35643564
N: Thibaut Varene
35653565
E: [email protected]

‎Documentation/ABI/obsolete/dv1394

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Documentation/ABI/removed/dv1394

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
What: dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
2+
Date: May 2010 (scheduled), finally removed in kernel v2.6.37
3+
Contact: [email protected]
4+
Description:
5+
/dev/dv1394/* were character device files, one for each FireWire
6+
controller and for NTSC and PAL respectively, from which DV data
7+
could be received by read() or transmitted by write(). A few
8+
ioctl()s allowed limited control.
9+
This special-purpose interface has been superseded by libraw1394 +
10+
libiec61883 which are functionally equivalent, support HDV, and
11+
transparently work on top of the newer firewire kernel drivers.
12+
13+
Users:
14+
ffmpeg/libavformat (if configured for DV1394)

‎Documentation/ABI/removed/raw1394

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: raw1394 (a.k.a. "Raw IEEE1394 I/O support" for FireWire)
2+
Date: May 2010 (scheduled), finally removed in kernel v2.6.37
3+
Contact: [email protected]
4+
Description:
5+
/dev/raw1394 was a character device file that allowed low-level
6+
access to FireWire buses. Its major drawbacks were its inability
7+
to implement sensible device security policies, and its low level
8+
of abstraction that required userspace clients do duplicate much
9+
of the kernel's ieee1394 core functionality.
10+
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
11+
firewire-core.
12+
13+
Users:
14+
libraw1394 (works with firewire-cdev too, transparent to library ABI
15+
users)

‎Documentation/ABI/removed/raw1394_legacy_isochronous

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎Documentation/ABI/removed/video1394

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
What: video1394 (a.k.a. "OHCI-1394 Video support" for FireWire)
2+
Date: May 2010 (scheduled), finally removed in kernel v2.6.37
3+
Contact: [email protected]
4+
Description:
5+
/dev/video1394/* were character device files, one for each FireWire
6+
controller, which were used for isochronous I/O. It was added as an
7+
alternative to raw1394's isochronous I/O functionality which had
8+
performance issues in its first generation. Any video1394 user had
9+
to use raw1394 + libraw1394 too because video1394 did not provide
10+
asynchronous I/O for device discovery and configuration.
11+
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
12+
firewire-core.
13+
14+
Users:
15+
libdc1394 (works with firewire-cdev too, transparent to library ABI
16+
users)

‎Documentation/ABI/testing/sysfs-ata

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
What: /sys/class/ata_...
2+
Date: August 2008
3+
Contact: Gwendal Grignou<[email protected]>
4+
Description:
5+
6+
Provide a place in sysfs for storing the ATA topology of the system. This allows
7+
retrieving various information about ATA objects.
8+
9+
Files under /sys/class/ata_port
10+
-------------------------------
11+
12+
For each port, a directory ataX is created where X is the ata_port_id of
13+
the port. The device parent is the ata host device.
14+
15+
idle_irq (read)
16+
17+
Number of IRQ received by the port while idle [some ata HBA only].
18+
19+
nr_pmp_links (read)
20+
21+
If a SATA Port Multiplier (PM) is connected, number of link behind it.
22+
23+
Files under /sys/class/ata_link
24+
-------------------------------
25+
26+
Behind each port, there is a ata_link. If there is a SATA PM in the
27+
topology, 15 ata_link objects are created.
28+
29+
If a link is behind a port, the directory name is linkX, where X is
30+
ata_port_id of the port.
31+
If a link is behind a PM, its name is linkX.Y where X is ata_port_id
32+
of the parent port and Y the PM port.
33+
34+
hw_sata_spd_limit
35+
36+
Maximum speed supported by the connected SATA device.
37+
38+
sata_spd_limit
39+
40+
Maximum speed imposed by libata.
41+
42+
sata_spd
43+
44+
Current speed of the link [1.5, 3Gps,...].
45+
46+
Files under /sys/class/ata_device
47+
---------------------------------
48+
49+
Behind each link, up to two ata device are created.
50+
The name of the directory is devX[.Y].Z where:
51+
- X is ata_port_id of the port where the device is connected,
52+
- Y the port of the PM if any, and
53+
- Z the device id: for PATA, there is usually 2 devices [0,1],
54+
only 1 for SATA.
55+
56+
class
57+
Device class. Can be "ata" for disk, "atapi" for packet device,
58+
"pmp" for PM, or "none" if no device was found behind the link.
59+
60+
dma_mode
61+
62+
Transfer modes supported by the device when in DMA mode.
63+
Mostly used by PATA device.
64+
65+
pio_mode
66+
67+
Transfer modes supported by the device when in PIO mode.
68+
Mostly used by PATA device.
69+
70+
xfer_mode
71+
72+
Current transfer mode.
73+
74+
id
75+
76+
Cached result of IDENTIFY command, as described in ATA8 7.16 and 7.17.
77+
Only valid if the device is not a PM.
78+
79+
gscr
80+
81+
Cached result of the dump of PM GSCR register.
82+
Valid registers are:
83+
0: SATA_PMP_GSCR_PROD_ID,
84+
1: SATA_PMP_GSCR_REV,
85+
2: SATA_PMP_GSCR_PORT_INFO,
86+
32: SATA_PMP_GSCR_ERROR,
87+
33: SATA_PMP_GSCR_ERROR_EN,
88+
64: SATA_PMP_GSCR_FEAT,
89+
96: SATA_PMP_GSCR_FEAT_EN,
90+
130: SATA_PMP_GSCR_SII_GPIO
91+
Only valid if the device is a PM.
92+
93+
spdn_cnt
94+
95+
Number of time libata decided to lower the speed of link due to errors.
96+
97+
ering
98+
99+
Formatted output of the error ring of the device.

‎Documentation/ABI/testing/sysfs-block-zram

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
What: /sys/block/zram<id>/disksize
2+
Date: August 2010
3+
Contact: Nitin Gupta <[email protected]>
4+
Description:
5+
The disksize file is read-write and specifies the disk size
6+
which represents the limit on the *uncompressed* worth of data
7+
that can be stored in this disk.
8+
9+
What: /sys/block/zram<id>/initstate
10+
Date: August 2010
11+
Contact: Nitin Gupta <[email protected]>
12+
Description:
13+
The disksize file is read-only and shows the initialization
14+
state of the device.
15+
16+
What: /sys/block/zram<id>/reset
17+
Date: August 2010
18+
Contact: Nitin Gupta <[email protected]>
19+
Description:
20+
The disksize file is write-only and allows resetting the
21+
device. The reset operation frees all the memory assocaited
22+
with this device.
23+
24+
What: /sys/block/zram<id>/num_reads
25+
Date: August 2010
26+
Contact: Nitin Gupta <[email protected]>
27+
Description:
28+
The num_reads file is read-only and specifies the number of
29+
reads (failed or successful) done on this device.
30+
31+
What: /sys/block/zram<id>/num_writes
32+
Date: August 2010
33+
Contact: Nitin Gupta <[email protected]>
34+
Description:
35+
The num_writes file is read-only and specifies the number of
36+
writes (failed or successful) done on this device.
37+
38+
What: /sys/block/zram<id>/invalid_io
39+
Date: August 2010
40+
Contact: Nitin Gupta <[email protected]>
41+
Description:
42+
The invalid_io file is read-only and specifies the number of
43+
non-page-size-aligned I/O requests issued to this device.
44+
45+
What: /sys/block/zram<id>/notify_free
46+
Date: August 2010
47+
Contact: Nitin Gupta <[email protected]>
48+
Description:
49+
The notify_free file is read-only and specifies the number of
50+
swap slot free notifications received by this device. These
51+
notifications are send to a swap block device when a swap slot
52+
is freed. This statistic is applicable only when this disk is
53+
being used as a swap disk.
54+
55+
What: /sys/block/zram<id>/discard
56+
Date: August 2010
57+
Contact: Nitin Gupta <[email protected]>
58+
Description:
59+
The discard file is read-only and specifies the number of
60+
discard requests received by this device. These requests
61+
provide information to block device regarding blocks which are
62+
no longer used by filesystem.
63+
64+
What: /sys/block/zram<id>/zero_pages
65+
Date: August 2010
66+
Contact: Nitin Gupta <[email protected]>
67+
Description:
68+
The zero_pages file is read-only and specifies number of zero
69+
filled pages written to this disk. No memory is allocated for
70+
such pages.
71+
72+
What: /sys/block/zram<id>/orig_data_size
73+
Date: August 2010
74+
Contact: Nitin Gupta <[email protected]>
75+
Description:
76+
The orig_data_size file is read-only and specifies uncompressed
77+
size of data stored in this disk. This excludes zero-filled
78+
pages (zero_pages) since no memory is allocated for them.
79+
Unit: bytes
80+
81+
What: /sys/block/zram<id>/compr_data_size
82+
Date: August 2010
83+
Contact: Nitin Gupta <[email protected]>
84+
Description:
85+
The compr_data_size file is read-only and specifies compressed
86+
size of data stored in this disk. So, compression ratio can be
87+
calculated using orig_data_size and this statistic.
88+
Unit: bytes
89+
90+
What: /sys/block/zram<id>/mem_used_total
91+
Date: August 2010
92+
Contact: Nitin Gupta <[email protected]>
93+
Description:
94+
The mem_used_total file is read-only and specifies the amount
95+
of memory, including allocator fragmentation and metadata
96+
overhead, allocated for this disk. So, allocator space
97+
efficiency can be calculated using compr_data_size and this
98+
statistic.
99+
Unit: bytes

‎Documentation/ABI/testing/sysfs-devices-power

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,91 @@ Description:
7777
devices this attribute is set to "enabled" by bus type code or
7878
device drivers and in that cases it should be safe to leave the
7979
default value.
80+
81+
What: /sys/devices/.../power/wakeup_count
82+
Date: September 2010
83+
Contact: Rafael J. Wysocki <[email protected]>
84+
Description:
85+
The /sys/devices/.../wakeup_count attribute contains the number
86+
of signaled wakeup events associated with the device. This
87+
attribute is read-only. If the device is not enabled to wake up
88+
the system from sleep states, this attribute is empty.
89+
90+
What: /sys/devices/.../power/wakeup_active_count
91+
Date: September 2010
92+
Contact: Rafael J. Wysocki <[email protected]>
93+
Description:
94+
The /sys/devices/.../wakeup_active_count attribute contains the
95+
number of times the processing of wakeup events associated with
96+
the device was completed (at the kernel level). This attribute
97+
is read-only. If the device is not enabled to wake up the
98+
system from sleep states, this attribute is empty.
99+
100+
What: /sys/devices/.../power/wakeup_hit_count
101+
Date: September 2010
102+
Contact: Rafael J. Wysocki <[email protected]>
103+
Description:
104+
The /sys/devices/.../wakeup_hit_count attribute contains the
105+
number of times the processing of a wakeup event associated with
106+
the device might prevent the system from entering a sleep state.
107+
This attribute is read-only. If the device is not enabled to
108+
wake up the system from sleep states, this attribute is empty.
109+
110+
What: /sys/devices/.../power/wakeup_active
111+
Date: September 2010
112+
Contact: Rafael J. Wysocki <[email protected]>
113+
Description:
114+
The /sys/devices/.../wakeup_active attribute contains either 1,
115+
or 0, depending on whether or not a wakeup event associated with
116+
the device is being processed (1). This attribute is read-only.
117+
If the device is not enabled to wake up the system from sleep
118+
states, this attribute is empty.
119+
120+
What: /sys/devices/.../power/wakeup_total_time_ms
121+
Date: September 2010
122+
Contact: Rafael J. Wysocki <[email protected]>
123+
Description:
124+
The /sys/devices/.../wakeup_total_time_ms attribute contains
125+
the total time of processing wakeup events associated with the
126+
device, in milliseconds. This attribute is read-only. If the
127+
device is not enabled to wake up the system from sleep states,
128+
this attribute is empty.
129+
130+
What: /sys/devices/.../power/wakeup_max_time_ms
131+
Date: September 2010
132+
Contact: Rafael J. Wysocki <[email protected]>
133+
Description:
134+
The /sys/devices/.../wakeup_max_time_ms attribute contains
135+
the maximum time of processing a single wakeup event associated
136+
with the device, in milliseconds. This attribute is read-only.
137+
If the device is not enabled to wake up the system from sleep
138+
states, this attribute is empty.
139+
140+
What: /sys/devices/.../power/wakeup_last_time_ms
141+
Date: September 2010
142+
Contact: Rafael J. Wysocki <[email protected]>
143+
Description:
144+
The /sys/devices/.../wakeup_last_time_ms attribute contains
145+
the value of the monotonic clock corresponding to the time of
146+
signaling the last wakeup event associated with the device, in
147+
milliseconds. This attribute is read-only. If the device is
148+
not enabled to wake up the system from sleep states, this
149+
attribute is empty.
150+
151+
What: /sys/devices/.../power/autosuspend_delay_ms
152+
Date: September 2010
153+
Contact: Alan Stern <[email protected]>
154+
Description:
155+
The /sys/devices/.../power/autosuspend_delay_ms attribute
156+
contains the autosuspend delay value (in milliseconds). Some
157+
drivers do not want their device to suspend as soon as it
158+
becomes idle at run time; they want the device to remain
159+
inactive for a certain minimum period of time first. That
160+
period is called the autosuspend delay. Negative values will
161+
prevent the device from being suspended at run time (similar
162+
to writing "on" to the power/control attribute). Values >=
163+
1000 will cause the autosuspend timer expiration to be rounded
164+
up to the nearest second.
165+
166+
Not all drivers support this attribute. If it isn't supported,
167+
attempts to read or write it will yield I/O errors.

0 commit comments

Comments
 (0)