Skip to content

Commit 8eb95f2

Browse files
author
Ingo Molnar
committed
Merge commit 'v2.6.27' into timers/hpet
2 parents d7451fc + 3fa8749 commit 8eb95f2

File tree

436 files changed

+4706
-3040
lines changed

Some content is hidden

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

436 files changed

+4706
-3040
lines changed

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com>
9696
Thomas Graf <tgraf@suug.ch>
9797
Tony Luck <tony.luck@intel.com>
9898
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
99+
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
100+
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
99101
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

‎Documentation/ABI/testing/sysfs-gpio

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
What: /sys/class/gpio/
2+
Date: July 2008
3+
KernelVersion: 2.6.27
4+
Contact: David Brownell <dbrownell@users.sourceforge.net>
5+
Description:
6+
7+
As a Kconfig option, individual GPIO signals may be accessed from
8+
userspace. GPIOs are only made available to userspace by an explicit
9+
"export" operation. If a given GPIO is not claimed for use by
10+
kernel code, it may be exported by userspace (and unexported later).
11+
Kernel code may export it for complete or partial access.
12+
13+
GPIOs are identified as they are inside the kernel, using integers in
14+
the range 0..INT_MAX. See Documentation/gpio.txt for more information.
15+
16+
/sys/class/gpio
17+
/export ... asks the kernel to export a GPIO to userspace
18+
/unexport ... to return a GPIO to the kernel
19+
/gpioN ... for each exported GPIO #N
20+
/value ... always readable, writes fail for input GPIOs
21+
/direction ... r/w as: in, out (default low); write: high, low
22+
/gpiochipN ... for each gpiochip; #N is its first GPIO
23+
/base ... (r/o) same as N
24+
/label ... (r/o) descriptive, not necessarily unique
25+
/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
26+

‎Documentation/DMA-mapping.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ failure can be determined by:
740740
dma_addr_t dma_handle;
741741

742742
dma_handle = pci_map_single(pdev, addr, size, direction);
743-
if (pci_dma_mapping_error(dma_handle)) {
743+
if (pci_dma_mapping_error(pdev, dma_handle)) {
744744
/*
745745
* reduce current DMA mapping usage,
746746
* delay and try again later or

‎Documentation/HOWTO

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ documentation files are also added which explain how to use the feature.
7777
When a kernel change causes the interface that the kernel exposes to
7878
userspace to change, it is recommended that you send the information or
7979
a patch to the manual pages explaining the change to the manual pages
80-
maintainer at mtk.manpages@gmail.com.
80+
maintainer at mtk.manpages@gmail.com, and CC the list
81+
linux-api@vger.kernel.org.
8182

8283
Here is a list of files that are in the kernel source tree that are
8384
required reading:

‎Documentation/SubmitChecklist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ kernel patches.
6767

6868
19: All new userspace interfaces are documented in Documentation/ABI/.
6969
See Documentation/ABI/README for more information.
70+
Patches that change userspace interfaces should be CCed to
71+
linux-api@vger.kernel.org.
7072

7173
20: Check that it all passes `make headers_check'.
7274

‎Documentation/cpu-freq/index.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ Mailing List
3535
------------
3636
There is a CPU frequency changing CVS commit and general list where
3737
you can report bugs, problems or submit patches. To post a message,
38-
send an email to cpufreq@lists.linux.org.uk, to subscribe go to
39-
http://lists.linux.org.uk/mailman/listinfo/cpufreq. Previous post to the
40-
mailing list are available to subscribers at
41-
http://lists.linux.org.uk/mailman/private/cpufreq/.
42-
38+
send an email to cpufreq@vger.kernel.org, to subscribe go to
39+
http://vger.kernel.org/vger-lists.html#cpufreq and follow the
40+
instructions there.
4341

4442
Links
4543
-----
@@ -50,7 +48,7 @@ how to access the CVS repository:
5048
* http://cvs.arm.linux.org.uk/
5149

5250
the CPUFreq Mailing list:
53-
* http://lists.linux.org.uk/mailman/listinfo/cpufreq
51+
* http://vger.kernel.org/vger-lists.html#cpufreq
5452

5553
Clock and voltage scaling for the SA-1100:
5654
* http://www.lartmaker.nl/projects/scaling

‎Documentation/cpusets.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -635,14 +635,16 @@ prior 'mems' setting, will not be moved.
635635

636636
There is an exception to the above. If hotplug functionality is used
637637
to remove all the CPUs that are currently assigned to a cpuset,
638-
then the kernel will automatically update the cpus_allowed of all
639-
tasks attached to CPUs in that cpuset to allow all CPUs. When memory
640-
hotplug functionality for removing Memory Nodes is available, a
641-
similar exception is expected to apply there as well. In general,
642-
the kernel prefers to violate cpuset placement, over starving a task
643-
that has had all its allowed CPUs or Memory Nodes taken offline. User
644-
code should reconfigure cpusets to only refer to online CPUs and Memory
645-
Nodes when using hotplug to add or remove such resources.
638+
then all the tasks in that cpuset will be moved to the nearest ancestor
639+
with non-empty cpus. But the moving of some (or all) tasks might fail if
640+
cpuset is bound with another cgroup subsystem which has some restrictions
641+
on task attaching. In this failing case, those tasks will stay
642+
in the original cpuset, and the kernel will automatically update
643+
their cpus_allowed to allow all online CPUs. When memory hotplug
644+
functionality for removing Memory Nodes is available, a similar exception
645+
is expected to apply there as well. In general, the kernel prefers to
646+
violate cpuset placement, over starving a task that has had all
647+
its allowed CPUs or Memory Nodes taken offline.
646648

647649
There is a second exception to the above. GFP_ATOMIC requests are
648650
kernel internal allocations that must be satisfied, immediately.

‎Documentation/feature-removal-schedule.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,11 @@ Why: Accounting can now be enabled/disabled without kernel recompilation.
322322
controlled by a kernel/module/sysfs/sysctl parameter.
323323
Who: Krzysztof Piotr Oledzki <ole@ans.pl>
324324

325+
---------------------------
326+
327+
What: ide-scsi (BLK_DEV_IDESCSI)
328+
When: 2.6.29
329+
Why: The 2.6 kernel supports direct writing to ide CD drives, which
330+
eliminates the need for ide-scsi. The new method is more
331+
efficient in every way.
332+
Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

‎Documentation/filesystems/proc.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2413,6 +2413,8 @@ The following 4 memory types are supported:
24132413
- (bit 1) anonymous shared memory
24142414
- (bit 2) file-backed private memory
24152415
- (bit 3) file-backed shared memory
2416+
- (bit 4) ELF header pages in file-backed private memory areas (it is
2417+
effective only if the bit 2 is cleared)
24162418

24172419
Note that MMIO pages such as frame buffer are never dumped and vDSO pages
24182420
are always dumped regardless of the bitmask status.

‎Documentation/hwmon/adt7473

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ Description
1414

1515
This driver implements support for the Analog Devices ADT7473 chip family.
1616

17-
The LM85 uses the 2-wire interface compatible with the SMBUS 2.0
17+
The ADT7473 uses the 2-wire interface compatible with the SMBUS 2.0
1818
specification. Using an analog to digital converter it measures three (3)
19-
temperatures and two (2) voltages. It has three (3) 16-bit counters for
19+
temperatures and two (2) voltages. It has four (4) 16-bit counters for
2020
measuring fan speed. There are three (3) PWM outputs that can be used
2121
to control fan speed.
2222

2323
A sophisticated control system for the PWM outputs is designed into the
24-
LM85 that allows fan speed to be adjusted automatically based on any of the
24+
ADT7473 that allows fan speed to be adjusted automatically based on any of the
2525
three temperature sensors. Each PWM output is individually adjustable and
2626
programmable. Once configured, the ADT7473 will adjust the PWM outputs in
2727
response to the measured temperatures without further host intervention.
@@ -46,23 +46,15 @@ from the raw value to get the temperature value.
4646
The Analog Devices datasheet is very detailed and describes a procedure for
4747
determining an optimal configuration for the automatic PWM control.
4848

49-
Hardware Configurations
50-
-----------------------
51-
52-
The ADT7473 chips have an optional SMBALERT output that can be used to
53-
signal the chipset in case a limit is exceeded or the temperature sensors
54-
fail. Individual sensor interrupts can be masked so they won't trigger
55-
SMBALERT. The SMBALERT output if configured replaces the PWM2 function.
56-
5749
Configuration Notes
5850
-------------------
5951

6052
Besides standard interfaces driver adds the following:
6153

6254
* PWM Control
6355

64-
* pwm#_auto_point1_pwm and pwm#_auto_point1_temp and
65-
* pwm#_auto_point2_pwm and pwm#_auto_point2_temp -
56+
* pwm#_auto_point1_pwm and temp#_auto_point1_temp and
57+
* pwm#_auto_point2_pwm and temp#_auto_point2_temp -
6658

6759
point1: Set the pwm speed at a lower temperature bound.
6860
point2: Set the pwm speed at a higher temperature bound.

‎Documentation/hwmon/sysfs-interface

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@ power[1-*]_average Average power use
329329
Unit: microWatt
330330
RO
331331

332+
power[1-*]_average_interval Power use averaging interval
333+
Unit: milliseconds
334+
RW
335+
332336
power[1-*]_average_highest Historical average maximum power use
333337
Unit: microWatt
334338
RO
@@ -353,6 +357,14 @@ power[1-*]_reset_history Reset input_highest, input_lowest,
353357
average_highest and average_lowest.
354358
WO
355359

360+
**********
361+
* Energy *
362+
**********
363+
364+
energy[1-*]_input Cumulative energy use
365+
Unit: microJoule
366+
RO
367+
356368
**********
357369
* Alarms *
358370
**********

‎Documentation/ioctl/cdrom.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,14 @@ CDROMCLOSETRAY pendant of CDROMEJECT
271271

272272
usage:
273273

274-
ioctl(fd, CDROMEJECT, 0);
274+
ioctl(fd, CDROMCLOSETRAY, 0);
275275

276276
inputs: none
277277

278278
outputs: none
279279

280280
error returns:
281-
ENOSYS cd drive not capable of ejecting
281+
ENOSYS cd drive not capable of closing the tray
282282
EBUSY other processes are accessing drive, or door is locked
283283

284284
notes:

‎Documentation/sysctl/kernel.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,10 @@ kernel. This value defaults to SHMMAX.
351351

352352
softlockup_thresh:
353353

354-
This value can be used to lower the softlockup tolerance
355-
threshold. The default threshold is 10s. If a cpu is locked up
356-
for 10s, the kernel complains. Valid values are 1-60s.
354+
This value can be used to lower the softlockup tolerance threshold. The
355+
default threshold is 60 seconds. If a cpu is locked up for 60 seconds,
356+
the kernel complains. Valid values are 1-60 seconds. Setting this
357+
tunable to zero will disable the softlockup detection altogether.
357358

358359
==============================================================
359360

‎Documentation/usb/anchors.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,21 @@ This function kills all URBs associated with an anchor. The URBs
4242
are called in the reverse temporal order they were submitted.
4343
This way no data can be reordered.
4444

45+
usb_unlink_anchored_urbs()
46+
--------------------------
47+
48+
This function unlinks all URBs associated with an anchor. The URBs
49+
are processed in the reverse temporal order they were submitted.
50+
This is similar to usb_kill_anchored_urbs(), but it will not sleep.
51+
Therefore no guarantee is made that the URBs have been unlinked when
52+
the call returns. They may be unlinked later but will be unlinked in
53+
finite time.
54+
4555
usb_wait_anchor_empty_timeout()
4656
-------------------------------
4757

4858
This function waits for all URBs associated with an anchor to finish
4959
or a timeout, whichever comes first. Its return value will tell you
5060
whether the timeout was reached.
61+
62+

‎Documentation/video4linux/CARDLIST.em28xx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
45 -> Pinnacle PCTV DVB-T (em2870)
4747
46 -> Compro, VideoMate U3 (em2870) [185b:2870]
4848
47 -> KWorld DVB-T 305U (em2880) [eb1a:e305]
49-
48 -> KWorld DVB-T 310U (em2880)
49+
48 -> KWorld DVB-T 310U (em2880) [eb1a:e310]
5050
49 -> MSI DigiVox A/D (em2880) [eb1a:e310]
5151
50 -> MSI DigiVox A/D II (em2880) [eb1a:e320]
5252
51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c]

‎Documentation/video4linux/gspca.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ pac7311 093a:260f SnakeCam
190190
pac7311 093a:2621 PAC731x
191191
pac7311 093a:2624 PAC7302
192192
pac7311 093a:2626 Labtec 2200
193+
pac7311 093a:262a Webcam 300k
193194
zc3xx 0ac8:0302 Z-star Vimicro zc0302
194195
vc032x 0ac8:0321 Vimicro generic vc0321
195196
vc032x 0ac8:0323 Vimicro Vc0323

0 commit comments

Comments
 (0)