Merge 'staging-next' to Linus's tree (e4c5bf8e) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-block-zram

0 → 100644

+99 −0

Original line number	Diff line number	Diff line
		What: /sys/block/zram<id>/disksize
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The disksize file is read-write and specifies the disk size
		which represents the limit on the uncompressed worth of data
		that can be stored in this disk.

		What: /sys/block/zram<id>/initstate
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The disksize file is read-only and shows the initialization
		state of the device.

		What: /sys/block/zram<id>/reset
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The disksize file is write-only and allows resetting the
		device. The reset operation frees all the memory assocaited
		with this device.

		What: /sys/block/zram<id>/num_reads
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The num_reads file is read-only and specifies the number of
		reads (failed or successful) done on this device.

		What: /sys/block/zram<id>/num_writes
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The num_writes file is read-only and specifies the number of
		writes (failed or successful) done on this device.

		What: /sys/block/zram<id>/invalid_io
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The invalid_io file is read-only and specifies the number of
		non-page-size-aligned I/O requests issued to this device.

		What: /sys/block/zram<id>/notify_free
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The notify_free file is read-only and specifies the number of
		swap slot free notifications received by this device. These
		notifications are send to a swap block device when a swap slot
		is freed. This statistic is applicable only when this disk is
		being used as a swap disk.

		What: /sys/block/zram<id>/discard
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The discard file is read-only and specifies the number of
		discard requests received by this device. These requests
		provide information to block device regarding blocks which are
		no longer used by filesystem.

		What: /sys/block/zram<id>/zero_pages
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The zero_pages file is read-only and specifies number of zero
		filled pages written to this disk. No memory is allocated for
		such pages.

		What: /sys/block/zram<id>/orig_data_size
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The orig_data_size file is read-only and specifies uncompressed
		size of data stored in this disk. This excludes zero-filled
		pages (zero_pages) since no memory is allocated for them.
		Unit: bytes

		What: /sys/block/zram<id>/compr_data_size
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The compr_data_size file is read-only and specifies compressed
		size of data stored in this disk. So, compression ratio can be
		calculated using orig_data_size and this statistic.
		Unit: bytes

		What: /sys/block/zram<id>/mem_used_total
		Date: August 2010
		Contact: Nitin Gupta <ngupta@vflare.org>
		Description:
		The mem_used_total file is read-only and specifies the amount
		of memory, including allocator fragmentation and metadata
		overhead, allocated for this disk. So, allocator space
		efficiency can be calculated using compr_data_size and this
		statistic.
		Unit: bytes
		No newline at end of file

Documentation/filesystems/00-INDEX

+0 −2

Original line number	Diff line number	Diff line
		@@ -96,8 +96,6 @@ seq_file.txt
		- how to use the seq_file API
		sharedsubtree.txt
		- a description of shared subtrees for namespaces.
		smbfs.txt
		- info on using filesystems with the SMB protocol (Win 3.11 and NT).
		spufs.txt
		- info and mount options for the SPU filesystem used on Cell.
		sysfs-pci.txt

Documentation/ioctl/ioctl-number.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ Code Seq#(hex) Include File Comments
		't' 00-7F linux/if_ppp.h
		't' 80-8F linux/isdn_ppp.h
		't' 90 linux/toshiba.h
		'u' 00-1F linux/smb_fs.h
		'u' 00-1F linux/smb_fs.h gone
		'v' all linux/videodev.h conflict!
		'v' 00-1F linux/ext2_fs.h conflict!
		'v' 00-1F linux/fs.h conflict!

MAINTAINERS

+11 −3

Original line number	Diff line number	Diff line
		@@ -1391,6 +1391,14 @@ L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/tg3.*

		BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
		M: Brett Rudley <brudley@broadcom.com>
		M: Henry Ptasinski <henryp@broadcom.com>
		M: Nohee Ko <noheek@broadcom.com>
		L: linux-wireless@vger.kernel.org
		S: Supported
		F: drivers/staging/brcm80211/

		BROCADE BFA FC SCSI DRIVER
		M: Jing Huang <huangj@brocade.com>
		L: linux-scsi@vger.kernel.org
		@@ -3383,8 +3391,8 @@ F: Documentation/kdump/
		KERNEL AUTOMOUNTER (AUTOFS)
		M: "H. Peter Anvin" <hpa@zytor.com>
		L: autofs@linux.kernel.org
		S: Odd Fixes
		F: fs/autofs/
		S: Obsolete
		F: drivers/staging/autofs/

		KERNEL AUTOMOUNTER v4 (AUTOFS4)
		M: Ian Kent <raven@themaw.net>
		@@ -5667,7 +5675,7 @@ S: Maintained

		STAGING SUBSYSTEM
		M: Greg Kroah-Hartman <gregkh@suse.de>
		T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
		L: devel@driverdev.osuosl.org
		S: Maintained
		F: drivers/staging/

arch/arm/mach-omap2/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,10 @@ obj-y += $(iommu-m) $(iommu-y)
		i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
		obj-y += $(i2c-omap-m) $(i2c-omap-y)

		ifneq ($(CONFIG_TIDSPBRIDGE),)
		obj-y += dsp.o
		endif

		# Specific board support
		obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
		obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o

Admin message