Merge tag v3.9-rc1 into for-3.9/upstream-fixes (6aeedba2) · Commits · e / devices / android_kernel_teracube_2e

Documentation/00-INDEX

+2 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,8 @@ memory-hotplug.txt
		- Hotpluggable memory support, how to use and current status.
		memory.txt
		- info on typical Linux memory problems.
		metag/
		- directory with info about Linux on Meta architecture.
		mips/
		- directory with info about Linux on MIPS architecture.
		misc-devices/

Documentation/ABI/testing/sysfs-bus-fcoe

+42 −3

Original line number	Diff line number	Diff line
		What: /sys/bus/fcoe/ctlr_X
		What: /sys/bus/fcoe/
		Date: August 2012
		KernelVersion: TBD
		Contact: Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org
		Description: The FCoE bus. Attributes in this directory are control interfaces.
		Attributes:

		ctlr_create: 'FCoE Controller' instance creation interface. Writing an
		<ifname> to this file will allocate and populate sysfs with a
		fcoe_ctlr_device (ctlr_X). The user can then configure any
		per-port settings and finally write to the fcoe_ctlr_device's
		'start' attribute to begin the kernel's discovery and login
		process.

		ctlr_destroy: 'FCoE Controller' instance removal interface. Writing a
		fcoe_ctlr_device's sysfs name to this file will log the
		fcoe_ctlr_device out of the fabric or otherwise connected
		FCoE devices. It will also free all kernel memory allocated
		for this fcoe_ctlr_device and any structures associated
		with it, this includes the scsi_host.

		What: /sys/bus/fcoe/devices/ctlr_X
		Date: March 2012
		KernelVersion: TBD
		Contact: Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org
		Description: 'FCoE Controller' instances on the fcoe bus
		Description: 'FCoE Controller' instances on the fcoe bus.
		The FCoE Controller now has a three stage creation process.
		1) Write interface name to ctlr_create 2) Configure the FCoE
		Controller (ctlr_X) 3) Enable the FCoE Controller to begin
		discovery and login. The FCoE Controller is destroyed by
		writing it's name, i.e. ctlr_X to the ctlr_delete file.

		Attributes:

		fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing
		this value will change the dev_loss_tmo for all
		FCFs discovered by this controller.

		mode: Display or change the FCoE Controller's mode. Possible
		modes are 'Fabric' and 'VN2VN'. If a FCoE Controller
		is started in 'Fabric' mode then FIP FCF discovery is
		initiated and ultimately a fabric login is attempted.
		If a FCoE Controller is started in 'VN2VN' mode then
		FIP VN2VN discovery and login is performed. A FCoE
		Controller only supports one mode at a time.

		enabled: Whether an FCoE controller is enabled or disabled.
		0 if disabled, 1 if enabled. Writing either 0 or 1
		to this file will enable or disable the FCoE controller.

		lesb/link_fail: Link Error Status Block (LESB) link failure count.

		lesb/vlink_fail: Link Error Status Block (LESB) virtual link
		@@ -26,7 +65,7 @@ Attributes:

		Notes: ctlr_X (global increment starting at 0)

		What: /sys/bus/fcoe/fcf_X
		What: /sys/bus/fcoe/devices/fcf_X
		Date: March 2012
		KernelVersion: TBD
		Contact: Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org

Documentation/ABI/testing/sysfs-kernel-mm-ksm

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/mm/ksm
		Date: September 2009
		KernelVersion: 2.6.32
		Contact: Linux memory management mailing list <linux-mm@kvack.org>
		Description: Interface for Kernel Samepage Merging (KSM)

		What: /sys/kernel/mm/ksm/full_scans
		What: /sys/kernel/mm/ksm/pages_shared
		What: /sys/kernel/mm/ksm/pages_sharing
		What: /sys/kernel/mm/ksm/pages_to_scan
		What: /sys/kernel/mm/ksm/pages_unshared
		What: /sys/kernel/mm/ksm/pages_volatile
		What: /sys/kernel/mm/ksm/run
		What: /sys/kernel/mm/ksm/sleep_millisecs
		Date: September 2009
		Contact: Linux memory management mailing list <linux-mm@kvack.org>
		Description: Kernel Samepage Merging daemon sysfs interface

		full_scans: how many times all mergeable areas have been
		scanned.

		pages_shared: how many shared pages are being used.

		pages_sharing: how many more sites are sharing them i.e. how
		much saved.

		pages_to_scan: how many present pages to scan before ksmd goes
		to sleep.

		pages_unshared: how many pages unique but repeatedly checked
		for merging.

		pages_volatile: how many pages changing too fast to be placed
		in a tree.

		run: write 0 to disable ksm, read 0 while ksm is disabled.
		write 1 to run ksm, read 1 while ksm is running.
		write 2 to disable ksm and unmerge all its pages.

		sleep_millisecs: how many milliseconds ksm should sleep between
		scans.

		See Documentation/vm/ksm.txt for more information.

		What: /sys/kernel/mm/ksm/merge_across_nodes
		Date: January 2013
		KernelVersion: 3.9
		Contact: Linux memory management mailing list <linux-mm@kvack.org>
		Description: Control merging pages across different NUMA nodes.

		When it is set to 0 only pages from the same node are merged,
		otherwise pages from all nodes can be merged together (default).

Documentation/ABI/testing/sysfs-platform-msi-laptop

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/platform/msi-laptop-pf/lcd_level
		Date: Oct 2006
		KernelVersion: 2.6.19
		Contact: "Lennart Poettering <mzxreary@0pointer.de>"
		Description:
		Screen brightness: contains a single integer in the range 0..8.

		What: /sys/devices/platform/msi-laptop-pf/auto_brightness
		Date: Oct 2006
		KernelVersion: 2.6.19
		Contact: "Lennart Poettering <mzxreary@0pointer.de>"
		Description:
		Enable automatic brightness control: contains either 0 or 1. If
		set to 1 the hardware adjusts the screen brightness
		automatically when the power cord is plugged/unplugged.

		What: /sys/devices/platform/msi-laptop-pf/wlan
		Date: Oct 2006
		KernelVersion: 2.6.19
		Contact: "Lennart Poettering <mzxreary@0pointer.de>"
		Description:
		WLAN subsystem enabled: contains either 0 or 1.

		What: /sys/devices/platform/msi-laptop-pf/bluetooth
		Date: Oct 2006
		KernelVersion: 2.6.19
		Contact: "Lennart Poettering <mzxreary@0pointer.de>"
		Description:
		Bluetooth subsystem enabled: contains either 0 or 1. Please
		note that this file is constantly 0 if no Bluetooth hardware is
		available.

		What: /sys/devices/platform/msi-laptop-pf/touchpad
		Date: Nov 2012
		KernelVersion: 3.8
		Contact: "Maxim Mikityanskiy <maxtram95@gmail.com>"
		Description:
		Contains either 0 or 1 and indicates if touchpad is turned on.
		Touchpad state can only be toggled by pressing Fn+F3.

		What: /sys/devices/platform/msi-laptop-pf/turbo_mode
		Date: Nov 2012
		KernelVersion: 3.8
		Contact: "Maxim Mikityanskiy <maxtram95@gmail.com>"
		Description:
		Contains either 0 or 1 and indicates if turbo mode is turned
		on. In turbo mode power LED is orange and processor is
		overclocked. Turbo mode is available only if charging. It is
		only possible to toggle turbo mode state by pressing Fn+F10,
		and there is a few seconds cooldown between subsequent toggles.
		If user presses Fn+F10 too frequent, turbo mode state is not
		changed.

		What: /sys/devices/platform/msi-laptop-pf/eco_mode
		Date: Nov 2012
		KernelVersion: 3.8
		Contact: "Maxim Mikityanskiy <maxtram95@gmail.com>"
		Description:
		Contains either 0 or 1 and indicates if ECO mode is turned on.
		In ECO mode power LED is green and userspace should do some
		powersaving actions. ECO mode is available only on battery
		power. ECO mode can only be toggled by pressing Fn+F10.

		What: /sys/devices/platform/msi-laptop-pf/turbo_cooldown
		Date: Nov 2012
		KernelVersion: 3.8
		Contact: "Maxim Mikityanskiy <maxtram95@gmail.com>"
		Description:
		Contains value in range 0..3:
		* 0 -> Turbo mode is off
		* 1 -> Turbo mode is on, cannot be turned off yet
		* 2 -> Turbo mode is off, cannot be turned on yet
		* 3 -> Turbo mode is on

		What: /sys/devices/platform/msi-laptop-pf/auto_fan
		Date: Nov 2012
		KernelVersion: 3.8
		Contact: "Maxim Mikityanskiy <maxtram95@gmail.com>"
		Description:
		Contains either 0 or 1 and indicates if fan speed is controlled
		automatically (1) or fan runs at maximal speed (0). Can be
		toggled in software.

Documentation/DMA-API-HOWTO.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -488,9 +488,10 @@ will invoke the generic mapping error check interface. Doing so will ensure
		that the mapping code will work correctly on all dma implementations without
		any dependency on the specifics of the underlying implementation. Using the
		returned address without checking for errors could result in failures ranging
		from panics to silent data corruption. Couple of example of incorrect ways to
		check for errors that make assumptions about the underlying dma implementation
		are as follows and these are applicable to dma_map_page() as well.
		from panics to silent data corruption. A couple of examples of incorrect ways
		to check for errors that make assumptions about the underlying dma
		implementation are as follows and these are applicable to dma_map_page() as
		well.

		Incorrect example 1:
		dma_addr_t dma_handle;
		@@ -751,7 +752,7 @@ Example 1:
		dma_unmap_single(dma_handle1);
		map_error_handling1:

		Example 2: (if buffers are allocated a loop, unmap all mapped buffers when
		Example 2: (if buffers are allocated in a loop, unmap all mapped buffers when
		mapping error is detected in the middle)

		dma_addr_t dma_addr;