diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:49:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:49:28 -0400 |
| commit | cbf67812b2f1431c5e432ddecd202984c6882f2a (patch) | |
| tree | a6c6fc3d65fdababe7af31433038dcc32ec05ebb /mm | |
| parent | 20dc9f01a867318ac0bc3ea9185d71f05076aeb0 (diff) | |
| parent | 33013a881104304fcffe817f17f22a1588908037 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
compat_ioctl: fix block device compat ioctl regression
[BLOCK] Fix bad sharing of tag busy list on queues with shared tag maps
Fix a build error when BLOCK=n
block: use lock bitops for the tag map.
cciss: update copyright notices
cfq_get_queue: fix possible NULL pointer access
blk_sync_queue() should cancel request_queue->unplug_work
cfq_exit_queue() should cancel cfq_data->unplug_work
block layer: remove a unused argument of drive_stat_acct()
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 5209e47b7fe3..7c8643630023 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/backing-dev.h> | 28 | #include <linux/backing-dev.h> |
| 29 | #include <linux/pagevec.h> | 29 | #include <linux/pagevec.h> |
| 30 | #include <linux/blkdev.h> | 30 | #include <linux/blkdev.h> |
| 31 | #include <linux/backing-dev.h> | ||
| 31 | #include <linux/security.h> | 32 | #include <linux/security.h> |
| 32 | #include <linux/syscalls.h> | 33 | #include <linux/syscalls.h> |
| 33 | #include <linux/cpuset.h> | 34 | #include <linux/cpuset.h> |