Merge branch 'linus' into x86/mm (8ecee462) · Commits · e / devices / android_kernel_fairphone_FP4

.gitignore

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@ include/linux/compile.h
	include/linux/version.h		include/linux/version.h
	include/linux/utsrelease.h		include/linux/utsrelease.h
	include/linux/bounds.h		include/linux/bounds.h
			include/generated

	# stgit generated dirs		# stgit generated dirs
	patches-*		patches-*

CREDITS

+17 −2

Original line number	Original line	Diff line number	Diff line
	@@ -495,6 +495,11 @@ S: Kopmansg 2
	S: 411 13 Goteborg		S: 411 13 Goteborg
	S: Sweden		S: Sweden

			N: Paul Bristow
			E: paul@paulbristow.net
			W: http://paulbristow.net/linux/idefloppy.html
			D: Maintainer of IDE/ATAPI floppy driver

	N: Dominik Brodowski		N: Dominik Brodowski
	E: linux@brodo.de		E: linux@brodo.de
	W: http://www.brodo.de/		W: http://www.brodo.de/
	@@ -1407,8 +1412,8 @@ P: 1024D/77D4FC9B F5C5 1C20 1DFC DEC3 3107 54A4 2332 ADFC 77D4 FC9B
	D: National Language Support		D: National Language Support
	D: Linux Internationalization Project		D: Linux Internationalization Project
	D: German Localization for Linux and GNU software		D: German Localization for Linux and GNU software
	S: Kriemhildring 12a		S: Auf der Fittel 18
	S: 65795 Hattersheim am Main		S: 53347 Alfter
	S: Germany		S: Germany

	N: Christoph Hellwig		N: Christoph Hellwig
	@@ -2642,6 +2647,10 @@ S: C/ Mieses 20, 9-B
	S: Valladolid 47009		S: Valladolid 47009
	S: Spain		S: Spain

			N: Gadi Oxman
			E: gadio@netvision.net.il
			D: Original author and maintainer of IDE/ATAPI floppy/tape drivers

	N: Greg Page		N: Greg Page
	E: gpage@sovereign.org		E: gpage@sovereign.org
	D: IPX development and support		D: IPX development and support
	@@ -3571,6 +3580,12 @@ N: Dirk Verworner
	D: Co-author of German book ``Linux-Kernel-Programmierung''		D: Co-author of German book ``Linux-Kernel-Programmierung''
	D: Co-founder of Berlin Linux User Group		D: Co-founder of Berlin Linux User Group

			N: Riku Voipio
			E: riku.voipio@iki.fi
			D: Author of PCA9532 LED and Fintek f75375s hwmon driver
			D: Some random ARM board patches
			S: Finland

	N: Patrick Volkerding		N: Patrick Volkerding
	E: volkerdi@ftp.cdrom.com		E: volkerdi@ftp.cdrom.com
	D: Produced the Slackware distribution, updated the SVGAlib		D: Produced the Slackware distribution, updated the SVGAlib

Documentation/00-INDEX

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,8 @@ cachetlb.txt
	- describes the cache/TLB flushing interfaces Linux uses.		- describes the cache/TLB flushing interfaces Linux uses.
	cdrom/		cdrom/
	- directory with information on the CD-ROM drivers that Linux has.		- directory with information on the CD-ROM drivers that Linux has.
			cgroups/
			- cgroups features, including cpusets and memory controller.
	connector/		connector/
	- docs on the netlink based userspace<->kernel space communication mod.		- docs on the netlink based userspace<->kernel space communication mod.
	console/		console/
	@@ -98,8 +100,6 @@ cpu-load.txt
	- document describing how CPU load statistics are collected.		- document describing how CPU load statistics are collected.
	cpuidle/		cpuidle/
	- info on CPU_IDLE, CPU idle state management subsystem.		- info on CPU_IDLE, CPU idle state management subsystem.
	cpusets.txt
	- documents the cpusets feature; assign CPUs and Mem to a set of tasks.
	cputopology.txt		cputopology.txt
	- documentation on how CPU topology info is exported via sysfs.		- documentation on how CPU topology info is exported via sysfs.
	cris/		cris/

Documentation/ABI/testing/debugfs-kmemtrace

0 → 100644

+71 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/kernel/debug/kmemtrace/
			Date: July 2008
			Contact: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
			Description:

			In kmemtrace-enabled kernels, the following files are created:

			/sys/kernel/debug/kmemtrace/
			cpu<n> (0400) Per-CPU tracing data, see below. (binary)
			total_overruns (0400) Total number of bytes which were dropped from
			cpu<n> files because of full buffer condition,
			non-binary. (text)
			abi_version (0400) Kernel's kmemtrace ABI version. (text)

			Each per-CPU file should be read according to the relay interface. That is,
			the reader should set affinity to that specific CPU and, as currently done by
			the userspace application (though there are other methods), use poll() with
			an infinite timeout before every read(). Otherwise, erroneous data may be
			read. The binary data has the following _core_ format:

			Event ID (1 byte) Unsigned integer, one of:
			0 - represents an allocation (KMEMTRACE_EVENT_ALLOC)
			1 - represents a freeing of previously allocated memory
			(KMEMTRACE_EVENT_FREE)
			Type ID (1 byte) Unsigned integer, one of:
			0 - this is a kmalloc() / kfree()
			1 - this is a kmem_cache_alloc() / kmem_cache_free()
			2 - this is a __get_free_pages() et al.
			Event size (2 bytes) Unsigned integer representing the
			size of this event. Used to extend
			kmemtrace. Discard the bytes you
			don't know about.
			Sequence number (4 bytes) Signed integer used to reorder data
			logged on SMP machines. Wraparound
			must be taken into account, although
			it is unlikely.
			Caller address (8 bytes) Return address to the caller.
			Pointer to mem (8 bytes) Pointer to target memory area. Can be
			NULL, but not all such calls might be
			recorded.

			In case of KMEMTRACE_EVENT_ALLOC events, the next fields follow:

			Requested bytes (8 bytes) Total number of requested bytes,
			unsigned, must not be zero.
			Allocated bytes (8 bytes) Total number of actually allocated
			bytes, unsigned, must not be lower
			than requested bytes.
			Requested flags (4 bytes) GFP flags supplied by the caller.
			Target CPU (4 bytes) Signed integer, valid for event id 1.
			If equal to -1, target CPU is the same
			as origin CPU, but the reverse might
			not be true.

			The data is made available in the same endianness the machine has.

			Other event ids and type ids may be defined and added. Other fields may be
			added by increasing event size, but see below for details.
			Every modification to the ABI, including new id definitions, are followed
			by bumping the ABI version by one.

			Adding new data to the packet (features) is done at the end of the mandatory
			data:
			Feature size (2 byte)
			Feature ID (1 byte)
			Feature data (Feature size - 3 bytes)


			Users:
			kmemtrace-user - git://repo.or.cz/kmemtrace-user.git

Documentation/ABI/testing/debugfs-pktcdvd

+3 −3

Original line number	Original line	Diff line number	Diff line
	What: /debug/pktcdvd/pktcdvd[0-7]		What: /sys/kernel/debug/pktcdvd/pktcdvd[0-7]
	Date: Oct. 2006		Date: Oct. 2006
	KernelVersion: 2.6.20		KernelVersion: 2.6.20
	Contact: Thomas Maier <balagi@justmail.de>		Contact: Thomas Maier <balagi@justmail.de>
	@@ -10,10 +10,10 @@ debugfs interface
	The pktcdvd module (packet writing driver) creates		The pktcdvd module (packet writing driver) creates
	these files in debugfs:		these files in debugfs:

	/debug/pktcdvd/pktcdvd[0-7]/		/sys/kernel/debug/pktcdvd/pktcdvd[0-7]/
	info (0444) Lots of driver statistics and infos.		info (0444) Lots of driver statistics and infos.

	Example:		Example:
	-------		-------

	cat /debug/pktcdvd/pktcdvd0/info		cat /sys/kernel/debug/pktcdvd/pktcdvd0/info