From 8a72dec00d1745136f4275ffd2c144eb9ab392cd Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 21 Sep 2007 09:19:54 +0200
Subject: [PATCH] --- yaml --- r: 66071 b: refs/heads/master c:
 f5ff8422bbdd59f8c1f699df248e1b7a11073027 h: refs/heads/master i:   66069:
 e64c4372fd04d97b30f9cc5eb317f5e7ba57dc38   66067:
 4c13ca651e200cbba9087cc4387211aaf46564eb   66063:
 c613f9cd547ad4a6cfe01aaddcbfb07484b0d3e2 v: v3

---
 [refs]                          | 2 +-
 trunk/fs/fs-writeback.c         | 1 +
 trunk/include/linux/blkdev.h    | 4 ++--
 trunk/include/linux/writeback.h | 1 +
 trunk/kernel/sched.c            | 1 +
 trunk/mm/readahead.c            | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 90d42ef789d5..b8466a26e2b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3317fedba9446465082bcc6ce1232451ad1d51ce
+refs/heads/master: f5ff8422bbdd59f8c1f699df248e1b7a11073027
diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c
index a4b142a6a2c7..8d23b0b38717 100644
--- a/trunk/fs/fs-writeback.c
+++ b/trunk/fs/fs-writeback.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 492ac946391e..a0a998140447 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_BLKDEV_H
 #define _LINUX_BLKDEV_H
 
+#ifdef CONFIG_BLOCK
+
 #include <linux/sched.h>
 #include <linux/major.h>
 #include <linux/genhd.h>
@@ -32,8 +34,6 @@
 )
 #endif
 
-#ifdef CONFIG_BLOCK
-
 struct scsi_ioctl_command;
 
 struct request_queue;
diff --git a/trunk/include/linux/writeback.h b/trunk/include/linux/writeback.h
index b4af6bcb7b7a..c7c3337c3a88 100644
--- a/trunk/include/linux/writeback.h
+++ b/trunk/include/linux/writeback.h
@@ -5,6 +5,7 @@
 #define WRITEBACK_H
 
 #include <linux/sched.h>
+#include <linux/fs.h>
 
 struct backing_dev_info;
 
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 6107a0cd6325..6c10fa796ca0 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -61,6 +61,7 @@
 #include <linux/delayacct.h>
 #include <linux/reciprocal_div.h>
 #include <linux/unistd.h>
+#include <linux/pagemap.h>
 
 #include <asm/tlb.h>
 
diff --git a/trunk/mm/readahead.c b/trunk/mm/readahead.c
index 39bf45d43320..be20c9d699d3 100644
--- a/trunk/mm/readahead.c
+++ b/trunk/mm/readahead.c
@@ -15,6 +15,7 @@
 #include <linux/backing-dev.h>
 #include <linux/task_io_accounting_ops.h>
 #include <linux/pagevec.h>
+#include <linux/pagemap.h>
 
 void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
 {