Merge branches 'x86/cleanups', 'x86/mpparse', 'x86/numa' and 'x86/uv' into x86/urgent (09369122) · Commits · e / devices / android_kernel_fairphone_FP4

CREDITS

+4 −4

Original line number	Diff line number	Diff line
		@@ -369,10 +369,10 @@ P: 1024/8462A731 4C 55 86 34 44 59 A7 99 2B 97 88 4A 88 9A 0D 97
		D: sun4 port, Sparc hacker

		N: Hugh Blemings
		E: hugh@misc.nu
		W: http://misc.nu/hugh/
		D: Author and maintainer of the Keyspan USB to Serial drivers
		S: Po Box 234
		E: hugh@blemings.org
		W: http://blemings.org/hugh
		D: Original author of the Keyspan USB to serial drivers, random PowerPC hacker
		S: PO Box 234
		S: Belconnen ACT 2616
		S: Australia

Documentation/cputopology.txt

+48 −0

Original line number	Diff line number	Diff line
		@@ -31,3 +31,51 @@ not defined by include/asm-XXX/topology.h:
		2) core_id: 0
		3) thread_siblings: just the given CPU
		4) core_siblings: just the given CPU

		Additionally, cpu topology information is provided under
		/sys/devices/system/cpu and includes these files. The internal
		source for the output is in brackets ("[]").

		kernel_max: the maximum cpu index allowed by the kernel configuration.
		[NR_CPUS-1]

		offline: cpus that are not online because they have been
		HOTPLUGGED off (see cpu-hotplug.txt) or exceed the limit
		of cpus allowed by the kernel configuration (kernel_max
		above). [~cpu_online_mask + cpus >= NR_CPUS]

		online: cpus that are online and being scheduled [cpu_online_mask]

		possible: cpus that have been allocated resources and can be
		brought online if they are present. [cpu_possible_mask]

		present: cpus that have been identified as being present in the
		system. [cpu_present_mask]

		The format for the above output is compatible with cpulist_parse()
		[see <linux/cpumask.h>]. Some examples follow.

		In this example, there are 64 cpus in the system but cpus 32-63 exceed
		the kernel max which is limited to 0..31 by the NR_CPUS config option
		being 32. Note also that cpus 2 and 4-31 are not online but could be
		brought online as they are both present and possible.

		kernel_max: 31
		offline: 2,4-31,32-63
		online: 0-1,3
		possible: 0-31
		present: 0-31

		In this example, the NR_CPUS config option is 128, but the kernel was
		started with possible_cpus=144. There are 4 cpus in the system and cpu2
		was manually taken offline (and is the only cpu that can be brought
		online.)

		kernel_max: 127
		offline: 2,4-127,128-143
		online: 0-1,3
		possible: 0-127
		present: 0-3

		See cpu-hotplug.txt for the possible_cpus=NUM kernel start parameter
		as well as more information on the various cpumask's.

Documentation/filesystems/ocfs2.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ Features which OCFS2 does not support yet:
		- quotas
		- Directory change notification (F_NOTIFY)
		- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
		- POSIX ACLs

		Mount options
		=============
		@@ -79,3 +78,5 @@ inode64 Indicates that Ocfs2 is allowed to create inodes at
		bits of significance.
		user_xattr (*) Enables Extended User Attributes.
		nouser_xattr Disables Extended User Attributes.
		acl Enables POSIX Access Control Lists support.
		noacl (*) Disables POSIX Access Control Lists support.

Documentation/filesystems/ubifs.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,9 @@ no_chk_data_crc skip checking of CRCs on data nodes in order to
		of this option is that corruption of the contents
		of a file can go unnoticed.
		chk_data_crc (*) do not skip checking CRCs on data nodes
		compr=none override default compressor and set it to "none"
		compr=lzo override default compressor and set it to "lzo"
		compr=zlib override default compressor and set it to "zlib"


		Quick usage instructions

Documentation/ioctl/ioctl-number.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ Code Seq# Include File Comments
		<http://linux01.gwdg.de/~alatham/ppdd.html>
		'M' all linux/soundcard.h
		'N' 00-1F drivers/usb/scanner.h
		'O' 00-02 include/mtd/ubi-user.h UBI
		'P' all linux/soundcard.h
		'Q' all linux/soundcard.h
		'R' 00-1F linux/random.h
		@@ -142,6 +143,9 @@ Code Seq# Include File Comments
		'n' 00-7F linux/ncp_fs.h
		'n' E0-FF video/matrox.h matroxfb
		'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2
		'o' 00-03 include/mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps)
		'o' 40-41 include/mtd/ubi-user.h UBI
		'o' 01-A1 include/linux/dvb/*.h DVB
		'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this)
		'p' 00-3F linux/mc146818rtc.h conflict!
		'p' 40-7F linux/nvram.h