Merge commit 'v2.6.37-rc7' into perf/core (6c529a26) · Commits · e / devices / android_kernel_teracube_2e

Documentation/filesystems/Locking

+6 −1

Original line number	Diff line number	Diff line
		@@ -173,12 +173,13 @@ prototypes:
		sector_t (bmap)(struct address_space , sector_t);
		int (invalidatepage) (struct page , unsigned long);
		int (releasepage) (struct page , int);
		void (freepage)(struct page );
		int (direct_IO)(int, struct kiocb , const struct iovec *iov,
		loff_t offset, unsigned long nr_segs);
		int (launder_page) (struct page );

		locking rules:
		All except set_page_dirty may block
		All except set_page_dirty and freepage may block

		BKL PageLocked(page) i_mutex
		writepage: no yes, unlocks (see below)
		@@ -193,6 +194,7 @@ perform_write: no n/a yes
		bmap: no
		invalidatepage: no yes
		releasepage: no yes
		freepage: no yes
		direct_IO: no
		launder_page: no yes

		@@ -288,6 +290,9 @@ buffers from the page in preparation for freeing it. It returns zero to
		indicate that the buffers are (or may be) freeable. If ->releasepage is zero,
		the kernel assumes that the fs has no private interest in the buffers.

		->freepage() is called when the kernel is done dropping the page
		from the page cache.

		->launder_page() may be called prior to releasing a page if
		it is still found to be dirty. It returns zero if the page was successfully
		cleaned, or an error value if not. Note that in order to prevent the page

+7 −0

Original line number	Diff line number	Diff line
		@@ -534,6 +534,7 @@ struct address_space_operations {
		sector_t (bmap)(struct address_space , sector_t);
		int (invalidatepage) (struct page , unsigned long);
		int (releasepage) (struct page , int);
		void (freepage)(struct page );
		ssize_t (direct_IO)(int, struct kiocb , const struct iovec *iov,
		loff_t offset, unsigned long nr_segs);
		struct page* (get_xip_page)(struct address_space , sector_t,
		@@ -678,6 +679,12 @@ struct address_space_operations {
		need to ensure this. Possibly it can clear the PageUptodate
		bit if it cannot free private data yet.

		freepage: freepage is called once the page is no longer visible in
		the page cache in order to allow the cleanup of any private
		data. Since it may be called by the memory reclaimer, it
		should not assume that the original address_space mapping still
		exists, and it should not block.

		direct_IO: called by the generic read/write routines to perform
		direct_IO - that is IO requests which bypass the page cache
		and transfer data directly between the storage and the

+0 −5

Original line number	Diff line number	Diff line
		@@ -2167,11 +2167,6 @@ and is between 256 and 4096 characters. It is defined in the file
		reset_devices [KNL] Force drivers to reset the underlying device
		during initialization.

		resource_alloc_from_bottom
		Allocate new resources from the beginning of available
		space, not the end. If you need to use this, please
		report a bug.

		resume= [SWSUSP]
		Specify the partition device for software suspend

+2 −2

Original line number	Diff line number	Diff line
		@@ -379,8 +379,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h:
		zero)

		bool pm_runtime_suspended(struct device *dev);
		- return true if the device's runtime PM status is 'suspended', or false
		otherwise
		- return true if the device's runtime PM status is 'suspended' and its
		'power.disable_depth' field is equal to zero, or false otherwise

		void pm_runtime_allow(struct device *dev);
		- set the power.runtime_auto flag for the device and decrease its usage

+12 −4

Original line number	Diff line number	Diff line
		@@ -559,14 +559,14 @@ W: http://maxim.org.za/at91_26.html
		S: Maintained

		ARM/BCMRING ARM ARCHITECTURE
		M: Leo Chen <leochen@broadcom.com>
		M: Jiandong Zheng <jdzheng@broadcom.com>
		M: Scott Branden <sbranden@broadcom.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: arch/arm/mach-bcmring

		ARM/BCMRING MTD NAND DRIVER
		M: Leo Chen <leochen@broadcom.com>
		M: Jiandong Zheng <jdzheng@broadcom.com>
		M: Scott Branden <sbranden@broadcom.com>
		L: linux-mtd@lists.infradead.org
		S: Maintained
		@@ -815,7 +815,7 @@ F: drivers/mmc/host/msm_sdcc.c
		F: drivers/mmc/host/msm_sdcc.h
		F: drivers/serial/msm_serial.h
		F: drivers/serial/msm_serial.c
		T: git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git
		T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
		S: Maintained

		ARM/TOSA MACHINE SUPPORT
		@@ -5932,7 +5932,6 @@ F: include/linux/tty.h

		TULIP NETWORK DRIVERS
		M: Grant Grundler <grundler@parisc-linux.org>
		M: Kyle McMartin <kyle@mcmartin.ca>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/tulip/
		@@ -6584,6 +6583,15 @@ F: include/linux/mfd/wm8400*
		F: include/sound/wm????.h
		F: sound/soc/codecs/wm*

		WORKQUEUE
		M: Tejun Heo <tj@kernel.org>
		L: linux-kernel@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
		S: Maintained
		F: include/linux/workqueue.h
		F: kernel/workqueue.c
		F: Documentation/workqueue.txt

		X.25 NETWORK LAYER
		M: Andrew Hendry <andrew.hendry@gmail.com>
		L: linux-x25@vger.kernel.org