From 06f1ad516dfbdb2eb0a1b9a2f8f354981224da86 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 20 May 2010 09:18:47 +0200
Subject: [PATCH] --- yaml --- r: 196877 b: refs/heads/master c:
 c2c4986eddaa7dc3d036cb2bfa5c8c5f1f2492a0 h: refs/heads/master i:   196875:
 ffbf4f7a3c32b5da655b9d520ef06f2c4ae6f711 v: v3

---
 [refs]                          | 2 +-
 trunk/fs/super.c                | 1 +
 trunk/include/linux/writeback.h | 4 ++++
 trunk/mm/page-writeback.c       | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9c1e76f08995..52a5da0db847 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b403a98e260f3a8c7c33f58a07c7ae549852170f
+refs/heads/master: c2c4986eddaa7dc3d036cb2bfa5c8c5f1f2492a0
diff --git a/trunk/fs/super.c b/trunk/fs/super.c
index dc72491a19f9..1527e6a0ee35 100644
--- a/trunk/fs/super.c
+++ b/trunk/fs/super.c
@@ -37,6 +37,7 @@
 #include <linux/kobject.h>
 #include <linux/mutex.h>
 #include <linux/file.h>
+#include <linux/backing-dev.h>
 #include <asm/uaccess.h>
 #include "internal.h"
 
diff --git a/trunk/include/linux/writeback.h b/trunk/include/linux/writeback.h
index 47e1c686cb02..cc97d6caf2b3 100644
--- a/trunk/include/linux/writeback.h
+++ b/trunk/include/linux/writeback.h
@@ -106,10 +106,14 @@ static inline void inode_sync_wait(struct inode *inode)
 /*
  * mm/page-writeback.c
  */
+#ifdef CONFIG_BLOCK
 void laptop_io_completion(struct backing_dev_info *info);
 void laptop_sync_completion(void);
 void laptop_mode_sync(struct work_struct *work);
 void laptop_mode_timer_fn(unsigned long data);
+#else
+static inline void laptop_sync_completion(void) { }
+#endif
 void throttle_vm_writeout(gfp_t gfp_mask);
 
 /* These are exported to sysctl. */
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
index 0d7bbe859550..9886424e1864 100644
--- a/trunk/mm/page-writeback.c
+++ b/trunk/mm/page-writeback.c
@@ -694,6 +694,7 @@ int dirty_writeback_centisecs_handler(ctl_table *table, int write,
 	return 0;
 }
 
+#ifdef CONFIG_BLOCK
 void laptop_mode_timer_fn(unsigned long data)
 {
 	struct request_queue *q = (struct request_queue *)data;
@@ -735,6 +736,7 @@ void laptop_sync_completion(void)
 
 	rcu_read_unlock();
 }
+#endif
 
 /*
  * If ratelimit_pages is too high then we can get into dirty-data overload