Merge branch 'linux-2.6' (bed04a44) · Commits · e / devices / android_kernel_teracube_emerald

.gitignore

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,3 +53,5 @@ cscope.*

	*.orig		*.orig
	*.rej		*.rej
			*~
			\#*#

Documentation/00-INDEX

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -183,8 +183,6 @@ i386/
	- directory with info about Linux on Intel 32 bit architecture.		- directory with info about Linux on Intel 32 bit architecture.
	ia64/		ia64/
	- directory with info about Linux on Intel 64 bit architecture.		- directory with info about Linux on Intel 64 bit architecture.
	ide.txt
	- important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).
	infiniband/		infiniband/
	- directory with documents concerning Linux InfiniBand support.		- directory with documents concerning Linux InfiniBand support.
	initrd.txt		initrd.txt

Documentation/DocBook/kernel-api.tmpl

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -361,12 +361,14 @@ X!Edrivers/pnp/system.c
	<chapter id="blkdev">		<chapter id="blkdev">
	<title>Block Devices</title>		<title>Block Devices</title>
	!Eblock/blk-core.c		!Eblock/blk-core.c
			!Iblock/blk-core.c
	!Eblock/blk-map.c		!Eblock/blk-map.c
	!Iblock/blk-sysfs.c		!Iblock/blk-sysfs.c
	!Eblock/blk-settings.c		!Eblock/blk-settings.c
	!Eblock/blk-exec.c		!Eblock/blk-exec.c
	!Eblock/blk-barrier.c		!Eblock/blk-barrier.c
	!Eblock/blk-tag.c		!Eblock/blk-tag.c
			!Iblock/blk-tag.c
	</chapter>		</chapter>

	<chapter id="chrdev">		<chapter id="chrdev">

Documentation/cdrom/ide-cd

+9 −9

Documentation/controllers/memory.txt

+9 −5

Original line number	Original line	Diff line number	Diff line
	Memory Controller		Memory Resource Controller

			NOTE: The Memory Resource Controller has been generically been referred
			to as the memory controller in this document. Do not confuse memory controller
			used here with the memory controller that is used in hardware.

	Salient features		Salient features

	@@ -152,7 +156,7 @@ The memory controller uses the following hierarchy

	a. Enable CONFIG_CGROUPS		a. Enable CONFIG_CGROUPS
	b. Enable CONFIG_RESOURCE_COUNTERS		b. Enable CONFIG_RESOURCE_COUNTERS
	c. Enable CONFIG_CGROUP_MEM_CONT		c. Enable CONFIG_CGROUP_MEM_RES_CTLR

	1. Prepare the cgroups		1. Prepare the cgroups
	# mkdir -p /cgroups		# mkdir -p /cgroups
	@@ -164,7 +168,7 @@ c. Enable CONFIG_CGROUP_MEM_CONT

	Since now we're in the 0 cgroup,		Since now we're in the 0 cgroup,
	We can alter the memory limit:		We can alter the memory limit:
	# echo -n 4M > /cgroups/0/memory.limit_in_bytes		# echo 4M > /cgroups/0/memory.limit_in_bytes

	NOTE: We can use a suffix (k, K, m, M, g or G) to indicate values in kilo,		NOTE: We can use a suffix (k, K, m, M, g or G) to indicate values in kilo,
	mega or gigabytes.		mega or gigabytes.
	@@ -185,7 +189,7 @@ number of factors, such as rounding up to page boundaries or the total
	availability of memory on the system. The user is required to re-read		availability of memory on the system. The user is required to re-read
	this file after a write to guarantee the value committed by the kernel.		this file after a write to guarantee the value committed by the kernel.

	# echo -n 1 > memory.limit_in_bytes		# echo 1 > memory.limit_in_bytes
	# cat memory.limit_in_bytes		# cat memory.limit_in_bytes
	4096		4096

	@@ -197,7 +201,7 @@ caches, RSS and Active pages/Inactive pages are shown.

	The memory.force_empty gives an interface to drop all charges by force.		The memory.force_empty gives an interface to drop all charges by force.

	# echo -n 1 > memory.force_empty		# echo 1 > memory.force_empty

	will drop all charges in cgroup. Currently, this is maintained for test.		will drop all charges in cgroup. Currently, this is maintained for test.

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@ This driver provides the following features:
	---------------		---------------

	0. The ide-cd relies on the ide disk driver. See		0. The ide-cd relies on the ide disk driver. See
	Documentation/ide.txt for up-to-date information on the ide		Documentation/ide/ide.txt for up-to-date information on the ide
	driver.		driver.

	1. Make sure that the ide and ide-cd drivers are compiled into the		1. Make sure that the ide and ide-cd drivers are compiled into the
	@@ -64,7 +64,7 @@ This driver provides the following features:

	Depending on what type of IDE interface you have, you may need to		Depending on what type of IDE interface you have, you may need to
	specify additional configuration options. See		specify additional configuration options. See
	Documentation/ide.txt.		Documentation/ide/ide.txt.

	2. You should also ensure that the iso9660 filesystem is either		2. You should also ensure that the iso9660 filesystem is either
	compiled into the kernel or available as a loadable module. You		compiled into the kernel or available as a loadable module. You
	@@ -84,7 +84,7 @@ This driver provides the following features:
	on the primary IDE interface are called `hda' and `hdb',		on the primary IDE interface are called `hda' and `hdb',
	respectively. The drives on the secondary interface are called		respectively. The drives on the secondary interface are called
	`hdc' and `hdd'. (Interfaces at other locations get other letters		`hdc' and `hdd'. (Interfaces at other locations get other letters
	in the third position; see Documentation/ide.txt.)		in the third position; see Documentation/ide/ide.txt.)

	If you want your CDROM drive to be found automatically by the		If you want your CDROM drive to be found automatically by the
	driver, you should make sure your IDE interface uses either the		driver, you should make sure your IDE interface uses either the
	@@ -93,7 +93,7 @@ This driver provides the following features:
	be jumpered as `master'. (If for some reason you cannot configure		be jumpered as `master'. (If for some reason you cannot configure
	your system in this manner, you can probably still use the driver.		your system in this manner, you can probably still use the driver.
	You may have to pass extra configuration information to the kernel		You may have to pass extra configuration information to the kernel
	when you boot, however. See Documentation/ide.txt for more		when you boot, however. See Documentation/ide/ide.txt for more
	information.)		information.)

	4. Boot the system. If the drive is recognized, you should see a		4. Boot the system. If the drive is recognized, you should see a
	@@ -201,7 +201,7 @@ TEST
	This section discusses some common problems encountered when trying to		This section discusses some common problems encountered when trying to
	use the driver, and some possible solutions. Note that if you are		use the driver, and some possible solutions. Note that if you are
	experiencing problems, you should probably also review		experiencing problems, you should probably also review
	Documentation/ide.txt for current information about the underlying		Documentation/ide/ide.txt for current information about the underlying
	IDE support code. Some of these items apply only to earlier versions		IDE support code. Some of these items apply only to earlier versions
	of the driver, but are mentioned here for completeness.		of the driver, but are mentioned here for completeness.