Merge branch 'perfcounters/urgent' into perfcounters/core (f76bd108) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/filesystems/9p.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -123,6 +123,9 @@ available from the same CVS repository.
	There are user and developer mailing lists available through the v9fs project		There are user and developer mailing lists available through the v9fs project
	on sourceforge (http://sourceforge.net/projects/v9fs).		on sourceforge (http://sourceforge.net/projects/v9fs).

			A stand-alone version of the module (which should build for any 2.6 kernel)
			is available via (http://github.com/ericvh/9p-sac/tree/master)

	News and other information is maintained on SWiK (http://swik.net/v9fs).		News and other information is maintained on SWiK (http://swik.net/v9fs).

	Bug reports may be issued through the kernel.org bugzilla		Bug reports may be issued through the kernel.org bugzilla

Documentation/filesystems/afs.txt

+12 −14

Original line number	Original line	Diff line number	Diff line
	@@ -23,15 +23,13 @@ it does support include:

	(*) Security (currently only AFS kaserver and KerberosIV tickets).		(*) Security (currently only AFS kaserver and KerberosIV tickets).

	(*) File reading.		(*) File reading and writing.

	(*) Automounting.		(*) Automounting.

	It does not yet support the following AFS features:		(*) Local caching (via fscache).

	(*) Write support.

	(*) Local caching.		It does not yet support the following AFS features:

	(*) pioctl() system call.		(*) pioctl() system call.

	@@ -56,7 +54,7 @@ They permit the debugging messages to be turned on dynamically by manipulating
	the masks in the following files:		the masks in the following files:

	/sys/module/af_rxrpc/parameters/debug		/sys/module/af_rxrpc/parameters/debug
	/sys/module/afs/parameters/debug		/sys/module/kafs/parameters/debug


	=====		=====
	@@ -66,9 +64,9 @@ USAGE
	When inserting the driver modules the root cell must be specified along with a		When inserting the driver modules the root cell must be specified along with a
	list of volume location server IP addresses:		list of volume location server IP addresses:

	insmod af_rxrpc.o		modprobe af_rxrpc
	insmod rxkad.o		modprobe rxkad
	insmod kafs.o rootcell=cambridge.redhat.com:172.16.18.73:172.16.18.91		modprobe kafs rootcell=cambridge.redhat.com:172.16.18.73:172.16.18.91

	The first module is the AF_RXRPC network protocol driver. This provides the		The first module is the AF_RXRPC network protocol driver. This provides the
	RxRPC remote operation protocol and may also be accessed from userspace. See:		RxRPC remote operation protocol and may also be accessed from userspace. See:
	@@ -81,7 +79,7 @@ is the actual filesystem driver for the AFS filesystem.
	Once the module has been loaded, more modules can be added by the following		Once the module has been loaded, more modules can be added by the following
	procedure:		procedure:

	echo add grand.central.org 18.7.14.88:128.2.191.224 >/proc/fs/afs/cells		echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 >/proc/fs/afs/cells

	Where the parameters to the "add" command are the name of a cell and a list of		Where the parameters to the "add" command are the name of a cell and a list of
	volume location servers within that cell, with the latter separated by colons.		volume location servers within that cell, with the latter separated by colons.
	@@ -101,7 +99,7 @@ The name of the volume can be suffixes with ".backup" or ".readonly" to
	specify connection to only volumes of those types.		specify connection to only volumes of those types.

	The name of the cell is optional, and if not given during a mount, then the		The name of the cell is optional, and if not given during a mount, then the
	named volume will be looked up in the cell specified during insmod.		named volume will be looked up in the cell specified during modprobe.

	Additional cells can be added through /proc (see later section).		Additional cells can be added through /proc (see later section).

	@@ -163,14 +161,14 @@ THE CELL DATABASE

	The filesystem maintains an internal database of all the cells it knows and the		The filesystem maintains an internal database of all the cells it knows and the
	IP addresses of the volume location servers for those cells. The cell to which		IP addresses of the volume location servers for those cells. The cell to which
	the system belongs is added to the database when insmod is performed by the		the system belongs is added to the database when modprobe is performed by the
	"rootcell=" argument or, if compiled in, using a "kafs.rootcell=" argument on		"rootcell=" argument or, if compiled in, using a "kafs.rootcell=" argument on
	the kernel command line.		the kernel command line.

	Further cells can be added by commands similar to the following:		Further cells can be added by commands similar to the following:

	echo add CELLNAME VLADDR[:VLADDR][:VLADDR]... >/proc/fs/afs/cells		echo add CELLNAME VLADDR[:VLADDR][:VLADDR]... >/proc/fs/afs/cells
	echo add grand.central.org 18.7.14.88:128.2.191.224 >/proc/fs/afs/cells		echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 >/proc/fs/afs/cells

	No other cell database operations are available at this time.		No other cell database operations are available at this time.

	@@ -233,7 +231,7 @@ insmod /tmp/kafs.o rootcell=cambridge.redhat.com:172.16.18.91
	mount -t afs \%root.afs. /afs		mount -t afs \%root.afs. /afs
	mount -t afs \%cambridge.redhat.com:root.cell. /afs/cambridge.redhat.com/		mount -t afs \%cambridge.redhat.com:root.cell. /afs/cambridge.redhat.com/

	echo add grand.central.org 18.7.14.88:128.2.191.224 > /proc/fs/afs/cells		echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 > /proc/fs/afs/cells
	mount -t afs "#grand.central.org:root.cell." /afs/grand.central.org/		mount -t afs "#grand.central.org:root.cell." /afs/grand.central.org/
	mount -t afs "#grand.central.org:root.archive." /afs/grand.central.org/archive		mount -t afs "#grand.central.org:root.archive." /afs/grand.central.org/archive
	mount -t afs "#grand.central.org:root.contrib." /afs/grand.central.org/contrib		mount -t afs "#grand.central.org:root.contrib." /afs/grand.central.org/contrib

Documentation/filesystems/proc.txt

+5 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1167,13 +1167,11 @@ CHAPTER 3: PER-PROCESS PARAMETERS
	3.1 /proc/<pid>/oom_adj - Adjust the oom-killer score		3.1 /proc/<pid>/oom_adj - Adjust the oom-killer score
	------------------------------------------------------		------------------------------------------------------

	This file can be used to adjust the score used to select which processes should		This file can be used to adjust the score used to select which processes
	be killed in an out-of-memory situation. The oom_adj value is a characteristic		should be killed in an out-of-memory situation. Giving it a high score will
	of the task's mm, so all threads that share an mm with pid will have the same		increase the likelihood of this process being killed by the oom-killer. Valid
	oom_adj value. A high value will increase the likelihood of this process being		values are in the range -16 to +15, plus the special value -17, which disables
	killed by the oom-killer. Valid values are in the range -16 to +15 as		oom-killing altogether for this process.
	explained below and a special value of -17, which disables oom-killing
	altogether for threads sharing pid's mm.

	The process to be killed in an out-of-memory situation is selected among all others		The process to be killed in an out-of-memory situation is selected among all others
	based on its badness score. This value equals the original memory size of the process		based on its badness score. This value equals the original memory size of the process
	@@ -1187,9 +1185,6 @@ the parent's score if they do not share the same memory. Thus forking servers
	are the prime candidates to be killed. Having only one 'hungry' child will make		are the prime candidates to be killed. Having only one 'hungry' child will make
	parent less preferable than the child.		parent less preferable than the child.

	/proc/<pid>/oom_adj cannot be changed for kthreads since they are immune from
	oom-killing already.

	/proc/<pid>/oom_score shows process' current badness score.		/proc/<pid>/oom_score shows process' current badness score.

	The following heuristics are then applied:		The following heuristics are then applied:

Documentation/video4linux/CARDLIST.em28xx

+1 −1

Original line number	Original line	Diff line number	Diff line
	0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]		0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
	1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]		1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
	2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]		2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]
	3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]		3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]
	4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]		4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]

Documentation/video4linux/CARDLIST.saa7134

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -153,8 +153,8 @@
	152 -> Asus Tiger Rev:1.00 [1043:4857]		152 -> Asus Tiger Rev:1.00 [1043:4857]
	153 -> Kworld Plus TV Analog Lite PCI [17de:7128]		153 -> Kworld Plus TV Analog Lite PCI [17de:7128]
	154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d]		154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d]
	155 -> Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid [0070:6706,0070:6708]		155 -> Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid [0070:6706,0070:6708]
	156 -> Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a]		156 -> Hauppauge WinTV-HVR1120 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a]
	157 -> Avermedia AVerTV Studio 507UA [1461:a11b]		157 -> Avermedia AVerTV Studio 507UA [1461:a11b]
	158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9]		158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9]
	159 -> Beholder BeholdTV 505 RDS [0000:505B]		159 -> Beholder BeholdTV 505 RDS [0000:505B]