Skip to content

Commit a9aa1d0

Browse files
fweisbecfweisbec
committed
Merge commit 'v2.6.34-rc7' into perf/nmi
Merge reason: catch up with latest softlockup detector changes.
2 parents 5671a10 + b57f95a commit a9aa1d0

File tree

11,152 files changed

+603005
-270609
lines changed

Some content is hidden

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

11,152 files changed

+603005
-270609
lines changed

‎.gitignore

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,18 @@ modules.builtin
3434
#
3535
# Top-level generic files
3636
#
37-
tags
38-
TAGS
39-
vmlinux
40-
vmlinuz
41-
System.map
42-
Module.markers
43-
Module.symvers
37+
/tags
38+
/TAGS
39+
/linux
40+
/vmlinux
41+
/vmlinuz
42+
/System.map
43+
/Module.markers
44+
/Module.symvers
45+
46+
#
47+
# git files that we don't want to ignore even it they are dot-files
48+
#
4449
!.gitignore
4550
!.mailmap
4651

‎Documentation/ABI/stable/sysfs-devices-node

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/devices/system/node/nodeX
2+
Date: October 2002
3+
Contact: Linux Memory Management list <linux-mm@kvack.org>
4+
Description:
5+
When CONFIG_NUMA is enabled, this is a directory containing
6+
information on node X such as what CPUs are local to the
7+
node.

‎Documentation/ABI/testing/ima_policy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Description:
2020
lsm: [[subj_user=] [subj_role=] [subj_type=]
2121
[obj_user=] [obj_role=] [obj_type=]]
2222

23-
base: func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]
23+
base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
2424
mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
2525
fsmagic:= hex value
2626
uid:= decimal value
@@ -40,11 +40,11 @@ Description:
4040

4141
measure func=BPRM_CHECK
4242
measure func=FILE_MMAP mask=MAY_EXEC
43-
measure func=INODE_PERM mask=MAY_READ uid=0
43+
measure func=FILE_CHECK mask=MAY_READ uid=0
4444

4545
The default policy measures all executables in bprm_check,
4646
all files mmapped executable in file_mmap, and all files
47-
open for read by root in inode_permission.
47+
open for read by root in do_filp_open.
4848

4949
Examples of LSM specific definitions:
5050

@@ -54,8 +54,8 @@ Description:
5454

5555
dont_measure obj_type=var_log_t
5656
dont_measure obj_type=auditd_log_t
57-
measure subj_user=system_u func=INODE_PERM mask=MAY_READ
58-
measure subj_role=system_r func=INODE_PERM mask=MAY_READ
57+
measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
58+
measure subj_role=system_r func=FILE_CHECK mask=MAY_READ
5959

6060
Smack:
61-
measure subj_user=_ func=INODE_PERM mask=MAY_READ
61+
measure subj_user=_ func=FILE_CHECK mask=MAY_READ

‎Documentation/ABI/testing/sysfs-block

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,17 @@ Description:
128128
preferred request size for workloads where sustained
129129
throughput is desired. If no optimal I/O size is
130130
reported this file contains 0.
131+
132+
What: /sys/block/<disk>/queue/nomerges
133+
Date: January 2010
134+
Contact:
135+
Description:
136+
Standard I/O elevator operations include attempts to
137+
merge contiguous I/Os. For known random I/O loads these
138+
attempts will always fail and result in extra cycles
139+
being spent in the kernel. This allows one to turn off
140+
this behavior on one of two ways: When set to 1, complex
141+
merge checks are disabled, but the simple one-shot merges
142+
with the previous I/O request are enabled. When set to 2,
143+
all merge tries are disabled. The default value is 0 -
144+
which enables all types of merge tries.

‎Documentation/ABI/testing/sysfs-bus-usb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,14 @@ Description:
159159
device. This is useful to ensure auto probing won't
160160
match the driver to the device. For example:
161161
# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
162+
163+
What: /sys/bus/usb/device/.../avoid_reset_quirk
164+
Date: December 2009
165+
Contact: Oliver Neukum <oliver@neukum.org>
166+
Description:
167+
Writing 1 to this file tells the kernel that this
168+
device will morph into another mode when it is reset.
169+
Drivers will not use reset for error handling for
170+
such devices.
171+
Users:
172+
usb_modeswitch

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

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
What: /sys/devices/.../power/
2+
Date: January 2009
3+
Contact: Rafael J. Wysocki <rjw@sisk.pl>
4+
Description:
5+
The /sys/devices/.../power directory contains attributes
6+
allowing the user space to check and modify some power
7+
management related properties of given device.
8+
9+
What: /sys/devices/.../power/wakeup
10+
Date: January 2009
11+
Contact: Rafael J. Wysocki <rjw@sisk.pl>
12+
Description:
13+
The /sys/devices/.../power/wakeup attribute allows the user
14+
space to check if the device is enabled to wake up the system
15+
from sleep states, such as the memory sleep state (suspend to
16+
RAM) and hibernation (suspend to disk), and to enable or disable
17+
it to do that as desired.
18+
19+
Some devices support "wakeup" events, which are hardware signals
20+
used to activate the system from a sleep state. Such devices
21+
have one of the following two values for the sysfs power/wakeup
22+
file:
23+
24+
+ "enabled\n" to issue the events;
25+
+ "disabled\n" not to do so;
26+
27+
In that cases the user space can change the setting represented
28+
by the contents of this file by writing either "enabled", or
29+
"disabled" to it.
30+
31+
For the devices that are not capable of generating system wakeup
32+
events this file contains "\n". In that cases the user space
33+
cannot modify the contents of this file and the device cannot be
34+
enabled to wake up the system.
35+
36+
What: /sys/devices/.../power/control
37+
Date: January 2009
38+
Contact: Rafael J. Wysocki <rjw@sisk.pl>
39+
Description:
40+
The /sys/devices/.../power/control attribute allows the user
41+
space to control the run-time power management of the device.
42+
43+
All devices have one of the following two values for the
44+
power/control file:
45+
46+
+ "auto\n" to allow the device to be power managed at run time;
47+
+ "on\n" to prevent the device from being power managed;
48+
49+
The default for all devices is "auto", which means that they may
50+
be subject to automatic power management, depending on their
51+
drivers. Changing this attribute to "on" prevents the driver
52+
from power managing the device at run time. Doing that while
53+
the device is suspended causes it to be woken up.
54+
55+
What: /sys/devices/.../power/async
56+
Date: January 2009
57+
Contact: Rafael J. Wysocki <rjw@sisk.pl>
58+
Description:
59+
The /sys/devices/.../async attribute allows the user space to
60+
enable or diasble the device's suspend and resume callbacks to
61+
be executed asynchronously (ie. in separate threads, in parallel
62+
with the main suspend/resume thread) during system-wide power
63+
transitions (eg. suspend to RAM, hibernation).
64+
65+
All devices have one of the following two values for the
66+
power/async file:
67+
68+
+ "enabled\n" to permit the asynchronous suspend/resume;
69+
+ "disabled\n" to forbid it;
70+
71+
The value of this attribute may be changed by writing either
72+
"enabled", or "disabled" to it.
73+
74+
It generally is unsafe to permit the asynchronous suspend/resume
75+
of a device unless it is certain that all of the PM dependencies
76+
of the device are known to the PM core. However, for some
77+
devices this attribute is set to "enabled" by bus type code or
78+
device drivers and in that cases it should be safe to leave the
79+
default value.

‎Documentation/ABI/testing/sysfs-platform-asus-laptop

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/devices/platform/asus-laptop/display
1+
What: /sys/devices/platform/asus_laptop/display
22
Date: January 2007
33
KernelVersion: 2.6.20
44
Contact: "Corentin Chary" <corentincj@iksaif.net>
@@ -13,27 +13,27 @@ Description:
1313
Ex: - 0 (0000b) means no display
1414
- 3 (0011b) CRT+LCD.
1515

16-
What: /sys/devices/platform/asus-laptop/gps
16+
What: /sys/devices/platform/asus_laptop/gps
1717
Date: January 2007
1818
KernelVersion: 2.6.20
1919
Contact: "Corentin Chary" <corentincj@iksaif.net>
2020
Description:
2121
Control the gps device. 1 means on, 0 means off.
2222
Users: Lapsus
2323

24-
What: /sys/devices/platform/asus-laptop/ledd
24+
What: /sys/devices/platform/asus_laptop/ledd
2525
Date: January 2007
2626
KernelVersion: 2.6.20
2727
Contact: "Corentin Chary" <corentincj@iksaif.net>
2828
Description:
2929
Some models like the W1N have a LED display that can be
3030
used to display several informations.
3131
To control the LED display, use the following :
32-
echo 0x0T000DDD > /sys/devices/platform/asus-laptop/
32+
echo 0x0T000DDD > /sys/devices/platform/asus_laptop/
3333
where T control the 3 letters display, and DDD the 3 digits display.
3434
The DDD table can be found in Documentation/laptops/asus-laptop.txt
3535

36-
What: /sys/devices/platform/asus-laptop/bluetooth
36+
What: /sys/devices/platform/asus_laptop/bluetooth
3737
Date: January 2007
3838
KernelVersion: 2.6.20
3939
Contact: "Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description:
4242
This may control the led, the device or both.
4343
Users: Lapsus
4444

45-
What: /sys/devices/platform/asus-laptop/wlan
45+
What: /sys/devices/platform/asus_laptop/wlan
4646
Date: January 2007
4747
KernelVersion: 2.6.20
4848
Contact: "Corentin Chary" <corentincj@iksaif.net>

‎Documentation/ABI/testing/sysfs-platform-eeepc-laptop

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/devices/platform/eeepc-laptop/disp
1+
What: /sys/devices/platform/eeepc/disp
22
Date: May 2008
33
KernelVersion: 2.6.26
44
Contact: "Corentin Chary" <corentincj@iksaif.net>
@@ -9,21 +9,21 @@ Description:
99
- 3 = LCD+CRT
1010
If you run X11, you should use xrandr instead.
1111

12-
What: /sys/devices/platform/eeepc-laptop/camera
12+
What: /sys/devices/platform/eeepc/camera
1313
Date: May 2008
1414
KernelVersion: 2.6.26
1515
Contact: "Corentin Chary" <corentincj@iksaif.net>
1616
Description:
1717
Control the camera. 1 means on, 0 means off.
1818

19-
What: /sys/devices/platform/eeepc-laptop/cardr
19+
What: /sys/devices/platform/eeepc/cardr
2020
Date: May 2008
2121
KernelVersion: 2.6.26
2222
Contact: "Corentin Chary" <corentincj@iksaif.net>
2323
Description:
2424
Control the card reader. 1 means on, 0 means off.
2525

26-
What: /sys/devices/platform/eeepc-laptop/cpufv
26+
What: /sys/devices/platform/eeepc/cpufv
2727
Date: Jun 2009
2828
KernelVersion: 2.6.31
2929
Contact: "Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description:
4242
`------------ Availables modes
4343
For example, 0x301 means: mode 1 selected, 3 available modes.
4444

45-
What: /sys/devices/platform/eeepc-laptop/available_cpufv
45+
What: /sys/devices/platform/eeepc/available_cpufv
4646
Date: Jun 2009
4747
KernelVersion: 2.6.31
4848
Contact: "Corentin Chary" <corentincj@iksaif.net>

‎Documentation/ABI/testing/sysfs-power

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,16 @@ Description:
101101

102102
CAUTION: Using it will cause your machine's real-time (CMOS)
103103
clock to be set to a random invalid time after a resume.
104+
105+
What: /sys/power/pm_async
106+
Date: January 2009
107+
Contact: Rafael J. Wysocki <rjw@sisk.pl>
108+
Description:
109+
The /sys/power/pm_async file controls the switch allowing the
110+
user space to enable or disable asynchronous suspend and resume
111+
of devices. If enabled, this feature will cause some device
112+
drivers' suspend and resume callbacks to be executed in parallel
113+
with each other and with the main suspend thread. It is enabled
114+
if this file contains "1", which is the default. It may be
115+
disabled by writing "0" to this file, in which case all devices
116+
will be suspended and resumed synchronously.

0 commit comments

Comments
 (0)