aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-29 07:49:28 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-29 07:49:28 -0700
commitcbf67812b2f1431c5e432ddecd202984c6882f2a (patch)
treea6c6fc3d65fdababe7af31433038dcc32ec05ebb /mm
parentMerge branch 'sg' of git://git.kernel.dk/linux-2.6-block (diff)
parentcompat_ioctl: fix block device compat ioctl regression (diff)
downloadlinux-dev-cbf67812b2f1431c5e432ddecd202984c6882f2a.tar.xz
linux-dev-cbf67812b2f1431c5e432ddecd202984c6882f2a.zip
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.c1
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 @@
#include <linux/backing-dev.h>
#include <linux/pagevec.h>
#include <linux/blkdev.h>
+#include <linux/backing-dev.h>
#include <linux/security.h>
#include <linux/syscalls.h>
#include <linux/cpuset.h>