Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 548b8416 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.34-rc1' into perf/urgent 



Conflicts:
	tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents cfb581bc 57d54889

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ modules.builtin 
#

tags

TAGS

linux

vmlinux

vmlinuz

System.map

Documentation/ABI/stable/sysfs-devices-node

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/devices/system/node/nodeX

Date:		October 2002

Contact:	Linux Memory Management list <linux-mm@kvack.org>

Description:

		When CONFIG_NUMA is enabled, this is a directory containing

		information on node X such as what CPUs are local to the

		node.

Documentation/ABI/testing/sysfs-block

+14 −0
Original line number Diff line number Diff line
@@ -128,3 +128,17 @@ Description: 
		preferred request size for workloads where sustained

		throughput is desired.  If no optimal I/O size is

		reported this file contains 0.



What:		/sys/block/<disk>/queue/nomerges

Date:		January 2010

Contact:

Description:

		Standard I/O elevator operations include attempts to

		merge contiguous I/Os. For known random I/O loads these

		attempts will always fail and result in extra cycles

		being spent in the kernel. This allows one to turn off

		this behavior on one of two ways: When set to 1, complex

		merge checks are disabled, but the simple one-shot merges

		with the previous I/O request are enabled. When set to 2,

		all merge tries are disabled. The default value is 0 -

		which enables all types of merge tries.

Documentation/ABI/testing/sysfs-bus-usb

+11 −0
Original line number Diff line number Diff line
@@ -159,3 +159,14 @@ Description: 
		device.  This is useful to ensure auto probing won't

		match the driver to the device.  For example:

		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id



What:		/sys/bus/usb/device/.../avoid_reset

Date:		December 2009

Contact:	Oliver Neukum <oliver@neukum.org>

Description:

		Writing 1 to this file tells the kernel that this

		device will morph into another mode when it is reset.

		Drivers will not use reset for error handling for

		such devices.

Users:

		usb_modeswitch

Documentation/ABI/testing/sysfs-devices-power

0 → 100644
+79 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power/

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../power directory contains attributes

		allowing the user space to check and modify some power

		management related properties of given device.



What:		/sys/devices/.../power/wakeup

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../power/wakeup attribute allows the user

		space to check if the device is enabled to wake up the system

		from sleep states, such as the memory sleep state (suspend to

		RAM) and hibernation (suspend to disk), and to enable or disable

		it to do that as desired.



		Some devices support "wakeup" events, which are hardware signals

		used to activate the system from a sleep state.  Such devices

		have one of the following two values for the sysfs power/wakeup

		file:



		+ "enabled\n" to issue the events;

		+ "disabled\n" not to do so;



		In that cases the user space can change the setting represented

		by the contents of this file by writing either "enabled", or

		"disabled" to it.



		For the devices that are not capable of generating system wakeup

		events this file contains "\n".  In that cases the user space

		cannot modify the contents of this file and the device cannot be

		enabled to wake up the system.



What:		/sys/devices/.../power/control

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../power/control attribute allows the user

		space to control the run-time power management of the device.



		All devices have one of the following two values for the

		power/control file:



		+ "auto\n" to allow the device to be power managed at run time;

		+ "on\n" to prevent the device from being power managed;



		The default for all devices is "auto", which means that they may

		be subject to automatic power management, depending on their

		drivers.  Changing this attribute to "on" prevents the driver

		from power managing the device at run time.  Doing that while

		the device is suspended causes it to be woken up.



What:		/sys/devices/.../power/async

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../async attribute allows the user space to

		enable or diasble the device's suspend and resume callbacks to

		be executed asynchronously (ie. in separate threads, in parallel

		with the main suspend/resume thread) during system-wide power

		transitions (eg. suspend to RAM, hibernation).



		All devices have one of the following two values for the

		power/async file:



		+ "enabled\n" to permit the asynchronous suspend/resume;

		+ "disabled\n" to forbid it;



		The value of this attribute may be changed by writing either

		"enabled", or "disabled" to it.



		It generally is unsafe to permit the asynchronous suspend/resume

		of a device unless it is certain that all of the PM dependencies

		of the device are known to the PM core.  However, for some

		devices this attribute is set to "enabled" by bus type code or

		device drivers and in that cases it should be safe to leave the

		default value.