Commit 275c8b93 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'this_cpu_ops' into for-2.6.38

parents 909ea964 8f1d97c7
Loading
Loading
Loading
Loading
+15 −1
Original line number Original line Diff line number Diff line
@@ -47,6 +47,20 @@ Date: January 2007
KernelVersion:	2.6.20
KernelVersion:	2.6.20
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Description:
Description:
		Control the bluetooth device. 1 means on, 0 means off.
		Control the wlan device. 1 means on, 0 means off.
		This may control the led, the device or both.
		This may control the led, the device or both.
Users:		Lapsus
Users:		Lapsus

What:		/sys/devices/platform/asus_laptop/wimax
Date:		October 2010
KernelVersion:	2.6.37
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Description:
		Control the wimax device. 1 means on, 0 means off.

What:		/sys/devices/platform/asus_laptop/wwan
Date:		October 2010
KernelVersion:	2.6.37
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Description:
		Control the wwan (3G) device. 1 means on, 0 means off.
+10 −0
Original line number Original line Diff line number Diff line
What:		/sys/devices/platform/eeepc-wmi/cpufv
Date:		Oct 2010
KernelVersion:	2.6.37
Contact:	"Corentin Chary" <corentincj@iksaif.net>
Description:
		Change CPU clock configuration (write-only).
		There are three available clock configuration:
		    * 0 -> Super Performance Mode
		    * 1 -> High Performance Mode
		    * 2 -> Power Saving Mode
+6 −1
Original line number Original line Diff line number Diff line
@@ -173,12 +173,13 @@ prototypes:
	sector_t (*bmap)(struct address_space *, sector_t);
	sector_t (*bmap)(struct address_space *, sector_t);
	int (*invalidatepage) (struct page *, unsigned long);
	int (*invalidatepage) (struct page *, unsigned long);
	int (*releasepage) (struct page *, int);
	int (*releasepage) (struct page *, int);
	void (*freepage)(struct page *);
	int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
	int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
			loff_t offset, unsigned long nr_segs);
			loff_t offset, unsigned long nr_segs);
	int (*launder_page) (struct page *);
	int (*launder_page) (struct page *);


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


			BKL	PageLocked(page)	i_mutex
			BKL	PageLocked(page)	i_mutex
writepage:		no	yes, unlocks (see below)
writepage:		no	yes, unlocks (see below)
@@ -193,6 +194,7 @@ perform_write: no n/a yes
bmap:			no
bmap:			no
invalidatepage:		no	yes
invalidatepage:		no	yes
releasepage:		no	yes
releasepage:		no	yes
freepage:		no	yes
direct_IO:		no
direct_IO:		no
launder_page:		no	yes
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,
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.
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
	->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
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
cleaned, or an error value if not. Note that in order to prevent the page
+7 −0
Original line number Original line Diff line number Diff line
@@ -534,6 +534,7 @@ struct address_space_operations {
	sector_t (*bmap)(struct address_space *, sector_t);
	sector_t (*bmap)(struct address_space *, sector_t);
	int (*invalidatepage) (struct page *, unsigned long);
	int (*invalidatepage) (struct page *, unsigned long);
	int (*releasepage) (struct page *, int);
	int (*releasepage) (struct page *, int);
	void (*freepage)(struct page *);
	ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
	ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
			loff_t offset, unsigned long nr_segs);
			loff_t offset, unsigned long nr_segs);
	struct page* (*get_xip_page)(struct address_space *, sector_t,
	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
        need to ensure this.  Possibly it can clear the PageUptodate
        bit if it cannot free private data yet.
        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: called by the generic read/write routines to perform
        direct_IO - that is IO requests which bypass the page cache
        direct_IO - that is IO requests which bypass the page cache
        and transfer data directly between the storage and the
        and transfer data directly between the storage and the
+12 −4
Original line number Original line Diff line number Diff line
@@ -559,14 +559,14 @@ W: http://maxim.org.za/at91_26.html
S:	Maintained
S:	Maintained


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


ARM/BCMRING MTD NAND DRIVER
ARM/BCMRING MTD NAND DRIVER
M:	Leo Chen <leochen@broadcom.com>
M:	Jiandong Zheng <jdzheng@broadcom.com>
M:	Scott Branden <sbranden@broadcom.com>
M:	Scott Branden <sbranden@broadcom.com>
L:	linux-mtd@lists.infradead.org
L:	linux-mtd@lists.infradead.org
S:	Maintained
S:	Maintained
@@ -815,7 +815,7 @@ F: drivers/mmc/host/msm_sdcc.c
F:	drivers/mmc/host/msm_sdcc.h
F:	drivers/mmc/host/msm_sdcc.h
F:	drivers/serial/msm_serial.h
F:	drivers/serial/msm_serial.h
F:	drivers/serial/msm_serial.c
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
S:	Maintained


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


TULIP NETWORK DRIVERS
TULIP NETWORK DRIVERS
M:	Grant Grundler <grundler@parisc-linux.org>
M:	Grant Grundler <grundler@parisc-linux.org>
M:	Kyle McMartin <kyle@mcmartin.ca>
L:	netdev@vger.kernel.org
L:	netdev@vger.kernel.org
S:	Maintained
S:	Maintained
F:	drivers/net/tulip/
F:	drivers/net/tulip/
@@ -6594,6 +6593,15 @@ F: include/linux/mfd/wm8400*
F:	include/sound/wm????.h
F:	include/sound/wm????.h
F:	sound/soc/codecs/wm*
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
X.25 NETWORK LAYER
M:	Andrew Hendry <andrew.hendry@gmail.com>
M:	Andrew Hendry <andrew.hendry@gmail.com>
L:	linux-x25@vger.kernel.org
L:	linux-x25@vger.kernel.org
Loading