Skip to content

Commit 698567f

Browse files
author
Jens Axboe
committed
Merge commit 'v2.6.39' into for-2.6.40/core
Since for-2.6.40/core was forked off the 2.6.39 devel tree, we've had churn in the core area that makes it difficult to handle patches for eg cfq or blk-throttle. Instead of requiring that they be based in older versions with bugs that have been fixed later in the rc cycle, merge in 2.6.39 final. Also fixes up conflicts in the below files. Conflicts: drivers/block/paride/pcd.c drivers/cdrom/viocd.c drivers/ide/ide-cd.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
2 parents d70d071 + 61c4f2c commit 698567f

File tree

802 files changed

+8458
-4459
lines changed

Some content is hidden

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

802 files changed

+8458
-4459
lines changed

‎Documentation/DocBook/media-entities.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@
294294
<!ENTITY sub-srggb10 SYSTEM "v4l/pixfmt-srggb10.xml">
295295
<!ENTITY sub-srggb8 SYSTEM "v4l/pixfmt-srggb8.xml">
296296
<!ENTITY sub-y10 SYSTEM "v4l/pixfmt-y10.xml">
297+
<!ENTITY sub-y12 SYSTEM "v4l/pixfmt-y12.xml">
297298
<!ENTITY sub-pixfmt SYSTEM "v4l/pixfmt.xml">
298299
<!ENTITY sub-cropcap SYSTEM "v4l/vidioc-cropcap.xml">
299300
<!ENTITY sub-dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml">

‎Documentation/DocBook/v4l/media-ioc-setup-link.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<varlistentry>
3535
<term><parameter>request</parameter></term>
3636
<listitem>
37-
<para>MEDIA_IOC_ENUM_LINKS</para>
37+
<para>MEDIA_IOC_SETUP_LINK</para>
3838
</listitem>
3939
</varlistentry>
4040
<varlistentry>

‎Documentation/DocBook/v4l/pixfmt-y12.xml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<refentry id="V4L2-PIX-FMT-Y12">
2+
<refmeta>
3+
<refentrytitle>V4L2_PIX_FMT_Y12 ('Y12 ')</refentrytitle>
4+
&manvol;
5+
</refmeta>
6+
<refnamediv>
7+
<refname><constant>V4L2_PIX_FMT_Y12</constant></refname>
8+
<refpurpose>Grey-scale image</refpurpose>
9+
</refnamediv>
10+
<refsect1>
11+
<title>Description</title>
12+
13+
<para>This is a grey-scale image with a depth of 12 bits per pixel. Pixels
14+
are stored in 16-bit words with unused high bits padded with 0. The least
15+
significant byte is stored at lower memory addresses (little-endian).</para>
16+
17+
<example>
18+
<title><constant>V4L2_PIX_FMT_Y12</constant> 4 &times; 4
19+
pixel image</title>
20+
21+
<formalpara>
22+
<title>Byte Order.</title>
23+
<para>Each cell is one byte.
24+
<informaltable frame="none">
25+
<tgroup cols="9" align="center">
26+
<colspec align="left" colwidth="2*" />
27+
<tbody valign="top">
28+
<row>
29+
<entry>start&nbsp;+&nbsp;0:</entry>
30+
<entry>Y'<subscript>00low</subscript></entry>
31+
<entry>Y'<subscript>00high</subscript></entry>
32+
<entry>Y'<subscript>01low</subscript></entry>
33+
<entry>Y'<subscript>01high</subscript></entry>
34+
<entry>Y'<subscript>02low</subscript></entry>
35+
<entry>Y'<subscript>02high</subscript></entry>
36+
<entry>Y'<subscript>03low</subscript></entry>
37+
<entry>Y'<subscript>03high</subscript></entry>
38+
</row>
39+
<row>
40+
<entry>start&nbsp;+&nbsp;8:</entry>
41+
<entry>Y'<subscript>10low</subscript></entry>
42+
<entry>Y'<subscript>10high</subscript></entry>
43+
<entry>Y'<subscript>11low</subscript></entry>
44+
<entry>Y'<subscript>11high</subscript></entry>
45+
<entry>Y'<subscript>12low</subscript></entry>
46+
<entry>Y'<subscript>12high</subscript></entry>
47+
<entry>Y'<subscript>13low</subscript></entry>
48+
<entry>Y'<subscript>13high</subscript></entry>
49+
</row>
50+
<row>
51+
<entry>start&nbsp;+&nbsp;16:</entry>
52+
<entry>Y'<subscript>20low</subscript></entry>
53+
<entry>Y'<subscript>20high</subscript></entry>
54+
<entry>Y'<subscript>21low</subscript></entry>
55+
<entry>Y'<subscript>21high</subscript></entry>
56+
<entry>Y'<subscript>22low</subscript></entry>
57+
<entry>Y'<subscript>22high</subscript></entry>
58+
<entry>Y'<subscript>23low</subscript></entry>
59+
<entry>Y'<subscript>23high</subscript></entry>
60+
</row>
61+
<row>
62+
<entry>start&nbsp;+&nbsp;24:</entry>
63+
<entry>Y'<subscript>30low</subscript></entry>
64+
<entry>Y'<subscript>30high</subscript></entry>
65+
<entry>Y'<subscript>31low</subscript></entry>
66+
<entry>Y'<subscript>31high</subscript></entry>
67+
<entry>Y'<subscript>32low</subscript></entry>
68+
<entry>Y'<subscript>32high</subscript></entry>
69+
<entry>Y'<subscript>33low</subscript></entry>
70+
<entry>Y'<subscript>33high</subscript></entry>
71+
</row>
72+
</tbody>
73+
</tgroup>
74+
</informaltable>
75+
</para>
76+
</formalpara>
77+
</example>
78+
</refsect1>
79+
</refentry>

‎Documentation/DocBook/v4l/pixfmt.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ information.</para>
696696
&sub-packed-yuv;
697697
&sub-grey;
698698
&sub-y10;
699+
&sub-y12;
699700
&sub-y16;
700701
&sub-yuyv;
701702
&sub-uyvy;

‎Documentation/DocBook/v4l/subdev-formats.xml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,23 @@
456456
<entry>b<subscript>1</subscript></entry>
457457
<entry>b<subscript>0</subscript></entry>
458458
</row>
459+
<row id="V4L2-MBUS-FMT-SGBRG8-1X8">
460+
<entry>V4L2_MBUS_FMT_SGBRG8_1X8</entry>
461+
<entry>0x3013</entry>
462+
<entry></entry>
463+
<entry>-</entry>
464+
<entry>-</entry>
465+
<entry>-</entry>
466+
<entry>-</entry>
467+
<entry>g<subscript>7</subscript></entry>
468+
<entry>g<subscript>6</subscript></entry>
469+
<entry>g<subscript>5</subscript></entry>
470+
<entry>g<subscript>4</subscript></entry>
471+
<entry>g<subscript>3</subscript></entry>
472+
<entry>g<subscript>2</subscript></entry>
473+
<entry>g<subscript>1</subscript></entry>
474+
<entry>g<subscript>0</subscript></entry>
475+
</row>
459476
<row id="V4L2-MBUS-FMT-SGRBG8-1X8">
460477
<entry>V4L2_MBUS_FMT_SGRBG8_1X8</entry>
461478
<entry>0x3002</entry>
@@ -473,6 +490,23 @@
473490
<entry>g<subscript>1</subscript></entry>
474491
<entry>g<subscript>0</subscript></entry>
475492
</row>
493+
<row id="V4L2-MBUS-FMT-SRGGB8-1X8">
494+
<entry>V4L2_MBUS_FMT_SRGGB8_1X8</entry>
495+
<entry>0x3014</entry>
496+
<entry></entry>
497+
<entry>-</entry>
498+
<entry>-</entry>
499+
<entry>-</entry>
500+
<entry>-</entry>
501+
<entry>r<subscript>7</subscript></entry>
502+
<entry>r<subscript>6</subscript></entry>
503+
<entry>r<subscript>5</subscript></entry>
504+
<entry>r<subscript>4</subscript></entry>
505+
<entry>r<subscript>3</subscript></entry>
506+
<entry>r<subscript>2</subscript></entry>
507+
<entry>r<subscript>1</subscript></entry>
508+
<entry>r<subscript>0</subscript></entry>
509+
</row>
476510
<row id="V4L2-MBUS-FMT-SBGGR10-DPCM8-1X8">
477511
<entry>V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8</entry>
478512
<entry>0x300b</entry>
@@ -2159,6 +2193,31 @@
21592193
<entry>u<subscript>1</subscript></entry>
21602194
<entry>u<subscript>0</subscript></entry>
21612195
</row>
2196+
<row id="V4L2-MBUS-FMT-Y12-1X12">
2197+
<entry>V4L2_MBUS_FMT_Y12_1X12</entry>
2198+
<entry>0x2013</entry>
2199+
<entry></entry>
2200+
<entry>-</entry>
2201+
<entry>-</entry>
2202+
<entry>-</entry>
2203+
<entry>-</entry>
2204+
<entry>-</entry>
2205+
<entry>-</entry>
2206+
<entry>-</entry>
2207+
<entry>-</entry>
2208+
<entry>y<subscript>11</subscript></entry>
2209+
<entry>y<subscript>10</subscript></entry>
2210+
<entry>y<subscript>9</subscript></entry>
2211+
<entry>y<subscript>8</subscript></entry>
2212+
<entry>y<subscript>7</subscript></entry>
2213+
<entry>y<subscript>6</subscript></entry>
2214+
<entry>y<subscript>5</subscript></entry>
2215+
<entry>y<subscript>4</subscript></entry>
2216+
<entry>y<subscript>3</subscript></entry>
2217+
<entry>y<subscript>2</subscript></entry>
2218+
<entry>y<subscript>1</subscript></entry>
2219+
<entry>y<subscript>0</subscript></entry>
2220+
</row>
21622221
<row id="V4L2-MBUS-FMT-UYVY8-1X16">
21632222
<entry>V4L2_MBUS_FMT_UYVY8_1X16</entry>
21642223
<entry>0x200f</entry>

‎Documentation/cgroups/memory.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ Brief summary of control files.
5252
tasks # attach a task(thread) and show list of threads
5353
cgroup.procs # show list of processes
5454
cgroup.event_control # an interface for event_fd()
55-
memory.usage_in_bytes # show current memory(RSS+Cache) usage.
56-
memory.memsw.usage_in_bytes # show current memory+Swap usage
55+
memory.usage_in_bytes # show current res_counter usage for memory
56+
(See 5.5 for details)
57+
memory.memsw.usage_in_bytes # show current res_counter usage for memory+Swap
58+
(See 5.5 for details)
5759
memory.limit_in_bytes # set/show limit of memory usage
5860
memory.memsw.limit_in_bytes # set/show limit of memory+Swap usage
5961
memory.failcnt # show the number of memory usage hits limits
@@ -453,6 +455,15 @@ memory under it will be reclaimed.
453455
You can reset failcnt by writing 0 to failcnt file.
454456
# echo 0 > .../memory.failcnt
455457

458+
5.5 usage_in_bytes
459+
460+
For efficiency, as other kernel components, memory cgroup uses some optimization
461+
to avoid unnecessary cacheline false sharing. usage_in_bytes is affected by the
462+
method and doesn't show 'exact' value of memory(and swap) usage, it's an fuzz
463+
value for efficient access. (Of course, when necessary, it's synchronized.)
464+
If you want to know more exact memory usage, you should use RSS+CACHE(+SWAP)
465+
value in memory.stat(see 5.2).
466+
456467
6. Hierarchy support
457468

458469
The memory controller supports a deep hierarchy and hierarchical accounting.

‎Documentation/flexible-arrays.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ trick is to ensure that any needed memory allocations are done before
6666
entering atomic context, using:
6767

6868
int flex_array_prealloc(struct flex_array *array, unsigned int start,
69-
unsigned int end, gfp_t flags);
69+
unsigned int nr_elements, gfp_t flags);
7070

7171
This function will ensure that memory for the elements indexed in the range
72-
defined by start and end has been allocated. Thereafter, a
72+
defined by start and nr_elements has been allocated. Thereafter, a
7373
flex_array_put() call on an element in that range is guaranteed not to
7474
block.
7575

‎Documentation/hwmon/adm1021

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ Supported chips:
1414
Prefix: 'gl523sm'
1515
Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
1616
Datasheet:
17-
* Intel Xeon Processor
18-
Prefix: - any other - may require 'force_adm1021' parameter
19-
Addresses scanned: none
20-
Datasheet: Publicly available at Intel website
2117
* Maxim MAX1617
2218
Prefix: 'max1617'
2319
Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
@@ -91,21 +87,27 @@ will do no harm, but will return 'old' values. It is possible to make
9187
ADM1021-clones do faster measurements, but there is really no good reason
9288
for that.
9389

94-
Xeon support
95-
------------
9690

97-
Some Xeon processors have real max1617, adm1021, or compatible chips
98-
within them, with two temperature sensors.
91+
Netburst-based Xeon support
92+
---------------------------
9993

100-
Other Xeons have chips with only one sensor.
94+
Some Xeon processors based on the Netburst (early Pentium 4, from 2001 to
95+
2003) microarchitecture had real MAX1617, ADM1021, or compatible chips
96+
within them, with two temperature sensors. Other Xeon processors of this
97+
era (with 400 MHz FSB) had chips with only one temperature sensor.
10198

102-
If you have a Xeon, and the adm1021 module loads, and both temperatures
103-
appear valid, then things are good.
99+
If you have such an old Xeon, and you get two valid temperatures when
100+
loading the adm1021 module, then things are good.
104101

105-
If the adm1021 module doesn't load, you should try this:
106-
modprobe adm1021 force_adm1021=BUS,ADDRESS
107-
ADDRESS can only be 0x18, 0x1a, 0x29, 0x2b, 0x4c, or 0x4e.
102+
If nothing happens when loading the adm1021 module, and you are certain
103+
that your specific Xeon processor model includes compatible sensors, you
104+
will have to explicitly instantiate the sensor chips from user-space. See
105+
method 4 in Documentation/i2c/instantiating-devices. Possible slave
106+
addresses are 0x18, 0x1a, 0x29, 0x2b, 0x4c, or 0x4e. It is likely that
107+
only temp2 will be correct and temp1 will have to be ignored.
108108

109-
If you have dual Xeons you may have appear to have two separate
110-
adm1021-compatible chips, or two single-temperature sensors, at distinct
111-
addresses.
109+
Previous generations of the Xeon processor (based on Pentium II/III)
110+
didn't have these sensors. Next generations of Xeon processors (533 MHz
111+
FSB and faster) lost them, until the Core-based generation which
112+
introduced integrated digital thermal sensors. These are supported by
113+
the coretemp driver.

‎Documentation/hwmon/lm90

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@ Supported chips:
3232
Addresses scanned: I2C 0x4c and 0x4d
3333
Datasheet: Publicly available at the ON Semiconductor website
3434
http://www.onsemi.com/PowerSolutions/product.do?id=ADT7461
35+
* Analog Devices ADT7461A
36+
Prefix: 'adt7461a'
37+
Addresses scanned: I2C 0x4c and 0x4d
38+
Datasheet: Publicly available at the ON Semiconductor website
39+
http://www.onsemi.com/PowerSolutions/product.do?id=ADT7461A
40+
* ON Semiconductor NCT1008
41+
Prefix: 'nct1008'
42+
Addresses scanned: I2C 0x4c and 0x4d
43+
Datasheet: Publicly available at the ON Semiconductor website
44+
http://www.onsemi.com/PowerSolutions/product.do?id=NCT1008
3545
* Maxim MAX6646
3646
Prefix: 'max6646'
3747
Addresses scanned: I2C 0x4d
@@ -149,7 +159,7 @@ ADM1032:
149159
* ALERT is triggered by open remote sensor.
150160
* SMBus PEC support for Write Byte and Receive Byte transactions.
151161

152-
ADT7461:
162+
ADT7461, ADT7461A, NCT1008:
153163
* Extended temperature range (breaks compatibility)
154164
* Lower resolution for remote temperature
155165

@@ -195,21 +205,22 @@ are exported, one for each channel, but these values are of course linked.
195205
Only the local hysteresis can be set from user-space, and the same delta
196206
applies to the remote hysteresis.
197207

198-
The lm90 driver will not update its values more frequently than every
199-
other second; reading them more often will do no harm, but will return
200-
'old' values.
208+
The lm90 driver will not update its values more frequently than configured with
209+
the update_interval attribute; reading them more often will do no harm, but will
210+
return 'old' values.
201211

202212
SMBus Alert Support
203213
-------------------
204214

205215
This driver has basic support for SMBus alert. When an alert is received,
206216
the status register is read and the faulty temperature channel is logged.
207217

208-
The Analog Devices chips (ADM1032 and ADT7461) do not implement the SMBus
209-
alert protocol properly so additional care is needed: the ALERT output is
210-
disabled when an alert is received, and is re-enabled only when the alarm
211-
is gone. Otherwise the chip would block alerts from other chips in the bus
212-
as long as the alarm is active.
218+
The Analog Devices chips (ADM1032, ADT7461 and ADT7461A) and ON
219+
Semiconductor chips (NCT1008) do not implement the SMBus alert protocol
220+
properly so additional care is needed: the ALERT output is disabled when
221+
an alert is received, and is re-enabled only when the alarm is gone.
222+
Otherwise the chip would block alerts from other chips in the bus as long
223+
as the alarm is active.
213224

214225
PEC Support
215226
-----------

‎Documentation/hwmon/max16064

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
Kernel driver max16064
2+
======================
3+
4+
Supported chips:
5+
* Maxim MAX16064
6+
Prefix: 'max16064'
7+
Addresses scanned: -
8+
Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf
9+
10+
Author: Guenter Roeck <guenter.roeck@ericsson.com>
11+
12+
13+
Description
14+
-----------
15+
16+
This driver supports hardware montoring for Maxim MAX16064 Quad Power-Supply
17+
Controller with Active-Voltage Output Control and PMBus Interface.
18+
19+
The driver is a client driver to the core PMBus driver.
20+
Please see Documentation/hwmon/pmbus for details on PMBus client drivers.
21+
22+
23+
Usage Notes
24+
-----------
25+
26+
This driver does not auto-detect devices. You will have to instantiate the
27+
devices explicitly. Please see Documentation/i2c/instantiating-devices for
28+
details.
29+
30+
31+
Platform data support
32+
---------------------
33+
34+
The driver supports standard PMBus driver platform data.
35+
36+
37+
Sysfs entries
38+
-------------
39+
40+
The following attributes are supported. Limits are read-write; all other
41+
attributes are read-only.
42+
43+
in[1-4]_label "vout[1-4]"
44+
in[1-4]_input Measured voltage. From READ_VOUT register.
45+
in[1-4]_min Minumum Voltage. From VOUT_UV_WARN_LIMIT register.
46+
in[1-4]_max Maximum voltage. From VOUT_OV_WARN_LIMIT register.
47+
in[1-4]_lcrit Critical minumum Voltage. VOUT_UV_FAULT_LIMIT register.
48+
in[1-4]_crit Critical maximum voltage. From VOUT_OV_FAULT_LIMIT register.
49+
in[1-4]_min_alarm Voltage low alarm. From VOLTAGE_UV_WARNING status.
50+
in[1-4]_max_alarm Voltage high alarm. From VOLTAGE_OV_WARNING status.
51+
in[1-4]_lcrit_alarm Voltage critical low alarm. From VOLTAGE_UV_FAULT status.
52+
in[1-4]_crit_alarm Voltage critical high alarm. From VOLTAGE_OV_FAULT status.
53+
54+
temp1_input Measured temperature. From READ_TEMPERATURE_1 register.
55+
temp1_max Maximum temperature. From OT_WARN_LIMIT register.
56+
temp1_crit Critical high temperature. From OT_FAULT_LIMIT register.
57+
temp1_max_alarm Chip temperature high alarm. Set by comparing
58+
READ_TEMPERATURE_1 with OT_WARN_LIMIT if TEMP_OT_WARNING
59+
status is set.
60+
temp1_crit_alarm Chip temperature critical high alarm. Set by comparing
61+
READ_TEMPERATURE_1 with OT_FAULT_LIMIT if TEMP_OT_FAULT
62+
status is set.

0 commit comments

Comments
 (0)