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

Commit 35858adb authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus

parents 197d4db7 4b70858b
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@
*.lst
*.symtypes
*.order
modules.builtin
*.elf
*.bin
*.gz
@@ -36,6 +37,7 @@
tags
TAGS
vmlinux
vmlinuz
System.map
Module.markers
Module.symvers
@@ -45,14 +47,8 @@ Module.symvers
#
# Generated include files
#
include/asm
include/asm-*/asm-offsets.h
include/config
include/linux/autoconf.h
include/linux/compile.h
include/linux/version.h
include/linux/utsrelease.h
include/linux/bounds.h
include/generated

# stgit generated dirs
+10 −8
Original line number Diff line number Diff line
@@ -21,25 +21,27 @@ Contact: Alan Stern <stern@rowland.harvard.edu>
Description:
		Each USB device directory will contain a file named
		power/level.  This file holds a power-level setting for
		the device, one of "on", "auto", or "suspend".
		the device, either "on" or "auto".

		"on" means that the device is not allowed to autosuspend,
		although normal suspends for system sleep will still
		be honored.  "auto" means the device will autosuspend
		and autoresume in the usual manner, according to the
		capabilities of its driver.  "suspend" means the device
		is forced into a suspended state and it will not autoresume
		in response to I/O requests.  However remote-wakeup requests
		from the device may still be enabled (the remote-wakeup
		setting is controlled separately by the power/wakeup
		attribute).
		capabilities of its driver.

		During normal use, devices should be left in the "auto"
		level.  The other levels are meant for administrative uses.
		level.  The "on" level is meant for administrative uses.
		If you want to suspend a device immediately but leave it
		free to wake up in response to I/O requests, you should
		write "0" to power/autosuspend.

		Device not capable of proper suspend and resume should be
		left in the "on" level.  Although the USB spec requires
		devices to support suspend/resume, many of them do not.
		In fact so many don't that by default, the USB core
		initializes all non-hub devices in the "on" level.  Some
		drivers may change this setting when they are bound.

What:		/sys/bus/usb/devices/.../power/persist
Date:		May 2007
KernelVersion:	2.6.23
+13 −1
Original line number Diff line number Diff line
@@ -60,6 +60,19 @@ Description:
Users:		hotplug memory remove tools
		https://w3.opensource.ibm.com/projects/powerpc-utils/


What:		/sys/devices/system/memoryX/nodeY
Date:		October 2009
Contact:	Linux Memory Management list <linux-mm@kvack.org>
Description:
		When CONFIG_NUMA is enabled, a symbolic link that
		points to the corresponding NUMA node directory.

		For example, the following symbolic link is created for
		memory section 9 on node0:
		/sys/devices/system/memory/memory9/node0 -> ../../node/node0


What:		/sys/devices/system/node/nodeX/memoryY
Date:		September 2008
Contact:	Gary Hade <garyhade@us.ibm.com>
@@ -70,4 +83,3 @@ Description:
		memory section directory.  For example, the following symbolic
		link is created for memory section 9 on node0.
		/sys/devices/system/node/node0/memory9 -> ../../memory/memory9
+14 −0
Original line number Diff line number Diff line
@@ -92,6 +92,20 @@ Description: Discover NUMA node a CPU belongs to
		/sys/devices/system/cpu/cpu42/node2 -> ../../node/node2


What:		/sys/devices/system/cpu/cpu#/node
Date:		October 2009
Contact:	Linux memory management mailing list <linux-mm@kvack.org>
Description:	Discover NUMA node a CPU belongs to

		When CONFIG_NUMA is enabled, a symbolic link that points
		to the corresponding NUMA node directory.

		For example, the following symlink is created for cpu42
		in NUMA node 2:

		/sys/devices/system/cpu/cpu42/node2 -> ../../node/node2


What:		/sys/devices/system/cpu/cpu#/topology/core_id
		/sys/devices/system/cpu/cpu#/topology/core_siblings
		/sys/devices/system/cpu/cpu#/topology/core_siblings_list
+44 −0
Original line number Diff line number Diff line
What:		/sys/devices/system/memory/soft_offline_page
Date:		Sep 2009
KernelVersion:	2.6.33
Contact:	andi@firstfloor.org
Description:
		Soft-offline the memory page containing the physical address
		written into this file. Input is a hex number specifying the
		physical address of the page. The kernel will then attempt
		to soft-offline it, by moving the contents elsewhere or
		dropping it if possible. The kernel will then be placed
		on the bad page list and never be reused.

		The offlining is done in kernel specific granuality.
		Normally it's the base page size of the kernel, but
		this might change.

		The page must be still accessible, not poisoned. The
		kernel will never kill anything for this, but rather
		fail the offline.  Return value is the size of the
		number, or a error when the offlining failed.  Reading
		the file is not allowed.

What:		/sys/devices/system/memory/hard_offline_page
Date:		Sep 2009
KernelVersion:	2.6.33
Contact:	andi@firstfloor.org
Description:
		Hard-offline the memory page containing the physical
		address written into this file. Input is a hex number
		specifying the physical address of the page. The
		kernel will then attempt to hard-offline the page, by
		trying to drop the page or killing any owner or
		triggering IO errors if needed.  Note this may kill
		any processes owning the page. The kernel will avoid
		to access this page assuming it's poisoned by the
		hardware.

		The offlining is done in kernel specific granuality.
		Normally it's the base page size of the kernel, but
		this might change.

		Return value is the size of the number, or a error when
		the offlining failed.
		Reading the file is not allowed.
Loading