Merge branch 'master' of... (1d2a1959) · Commits · jan.koester / Linux

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ modules.builtin
		*.gz
		*.bz2
		*.lzma
		*.xz
		*.lzo
		*.patch
		*.gcno

Documentation/00-INDEX

+0 −4

Original line number	Diff line number	Diff line
		@@ -328,8 +328,6 @@ sysrq.txt
		- info on the magic SysRq key.
		telephony/
		- directory with info on telephony (e.g. voice over IP) support.
		time_interpolators.txt
		- info on time interpolators.
		uml/
		- directory with information about User Mode Linux.
		unicode.txt
		@@ -346,8 +344,6 @@ vm/
		- directory with info on the Linux vm code.
		volatile-considered-harmful.txt
		- Why the "volatile" type class should not be used
		voyager.txt
		- guide to running Linux on the Voyager architecture.
		w1/
		- directory with documents regarding the 1-wire (w1) subsystem.
		watchdog/

Documentation/ABI/stable/sysfs-firmware-efi-vars

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		What: /sys/firmware/efi/vars
		Date: April 2004
		Contact: Matt Domsch <Matt_Domsch@dell.com>
		Description:
		This directory exposes interfaces for interactive with
		EFI variables. For more information on EFI variables,
		see 'Variable Services' in the UEFI specification
		(section 7.2 in specification version 2.3 Errata D).

		In summary, EFI variables are named, and are classified
		into separate namespaces through the use of a vendor
		GUID. They also have an arbitrary binary value
		associated with them.

		The efivars module enumerates these variables and
		creates a separate directory for each one found. Each
		directory has a name of the form "<key>-<vendor guid>"
		and contains the following files:

		attributes: A read-only text file enumerating the
		EFI variable flags. Potential values
		include:

		EFI_VARIABLE_NON_VOLATILE
		EFI_VARIABLE_BOOTSERVICE_ACCESS
		EFI_VARIABLE_RUNTIME_ACCESS
		EFI_VARIABLE_HARDWARE_ERROR_RECORD
		EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS

		See the EFI documentation for an
		explanation of each of these variables.

		data: A read-only binary file that can be read
		to attain the value of the EFI variable

		guid: The vendor GUID of the variable. This
		should always match the GUID in the
		variable's name.

		raw_var: A binary file that can be read to obtain
		a structure that contains everything
		there is to know about the variable.
		For structure definition see "struct
		efi_variable" in the kernel sources.

		This file can also be written to in
		order to update the value of a variable.
		For this to work however, all fields of
		the "struct efi_variable" passed must
		match byte for byte with the structure
		read out of the file, save for the value
		portion.

		Note the efi_variable structure
		read/written with this file contains a
		'long' type that may change widths
		depending on your underlying
		architecture.

		size: As ASCII representation of the size of
		the variable's value.


		In addition, two other magic binary files are provided
		in the top-level directory and are used for adding and
		removing variables:

		new_var: Takes a "struct efi_variable" and
		instructs the EFI firmware to create a
		new variable.

		del_var: Takes a "struct efi_variable" and
		instructs the EFI firmware to remove any
		variable that has a matching vendor GUID
		and variable key name.

Documentation/ABI/testing/pstore

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		Where: /dev/pstore/...
		Date: January 2011
		Kernel Version: 2.6.38
		Contact: tony.luck@intel.com
		Description: Generic interface to platform dependent persistent storage.

		Platforms that provide a mechanism to preserve some data
		across system reboots can register with this driver to
		provide a generic interface to show records captured in
		the dying moments. In the case of a panic the last part
		of the console log is captured, but other interesting
		data can also be saved.

		# mount -t pstore - /dev/pstore

		$ ls -l /dev/pstore
		total 0
		-r--r--r-- 1 root root 7896 Nov 30 15:38 dmesg-erst-1

		Different users of this interface will result in different
		filename prefixes. Currently two are defined:

		"dmesg" - saved console log
		"mce" - architecture dependent data from fatal h/w error

		Once the information in a file has been read, removing
		the file will signal to the underlying persistent storage
		device that it can reclaim the space for later re-use.

		$ rm /dev/pstore/dmesg-erst-1

		The expectation is that all files in /dev/pstore
		will be saved elsewhere and erased from persistent store
		soon after boot to free up space ready for the next
		catastrophe.

Documentation/ABI/testing/sysfs-devices-power

+10 −10

Original line number	Diff line number	Diff line
		@@ -29,9 +29,8 @@ Description:
		"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.
		events this file is not present. In that case the device cannot
		be enabled to wake up the system from sleep states.

		What: /sys/devices/.../power/control
		Date: January 2009
		@@ -85,7 +84,7 @@ Description:
		The /sys/devices/.../wakeup_count attribute contains the number
		of signaled wakeup events associated with the device. This
		attribute is read-only. If the device is not enabled to wake up
		the system from sleep states, this attribute is empty.
		the system from sleep states, this attribute is not present.

		What: /sys/devices/.../power/wakeup_active_count
		Date: September 2010
		@@ -95,7 +94,7 @@ Description:
		number of times the processing of wakeup events associated with
		the device was completed (at the kernel level). This attribute
		is read-only. If the device is not enabled to wake up the
		system from sleep states, this attribute is empty.
		system from sleep states, this attribute is not present.

		What: /sys/devices/.../power/wakeup_hit_count
		Date: September 2010
		@@ -105,7 +104,8 @@ Description:
		number of times the processing of a wakeup event associated with
		the device might prevent the system from entering a sleep state.
		This attribute is read-only. If the device is not enabled to
		wake up the system from sleep states, this attribute is empty.
		wake up the system from sleep states, this attribute is not
		present.

		What: /sys/devices/.../power/wakeup_active
		Date: September 2010
		@@ -115,7 +115,7 @@ Description:
		or 0, depending on whether or not a wakeup event associated with
		the device is being processed (1). This attribute is read-only.
		If the device is not enabled to wake up the system from sleep
		states, this attribute is empty.
		states, this attribute is not present.

		What: /sys/devices/.../power/wakeup_total_time_ms
		Date: September 2010
		@@ -125,7 +125,7 @@ Description:
		the total time of processing wakeup events associated with the
		device, in milliseconds. This attribute is read-only. If the
		device is not enabled to wake up the system from sleep states,
		this attribute is empty.
		this attribute is not present.

		What: /sys/devices/.../power/wakeup_max_time_ms
		Date: September 2010
		@@ -135,7 +135,7 @@ Description:
		the maximum time of processing a single wakeup event associated
		with the device, in milliseconds. This attribute is read-only.
		If the device is not enabled to wake up the system from sleep
		states, this attribute is empty.
		states, this attribute is not present.

		What: /sys/devices/.../power/wakeup_last_time_ms
		Date: September 2010
		@@ -146,7 +146,7 @@ Description:
		signaling the last wakeup event associated with the device, in
		milliseconds. This attribute is read-only. If the device is
		not enabled to wake up the system from sleep states, this
		attribute is empty.
		attribute is not present.

		What: /sys/devices/.../power/autosuspend_delay_ms
		Date: September 2010