From: Andrew Morton <akpm@osdl.org>

Cc: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/writeback.h |    1 +
 mm/memory_hotplug.c       |    4 ++--
 mm/page-writeback.c       |    6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff -puN include/linux/writeback.h~call-mm-page-writebackcset_ratelimit-when-new-pages-tidy include/linux/writeback.h
--- a/include/linux/writeback.h~call-mm-page-writebackcset_ratelimit-when-new-pages-tidy
+++ a/include/linux/writeback.h
@@ -119,6 +119,7 @@ int sync_page_range(struct inode *inode,
 int sync_page_range_nolock(struct inode *inode, struct address_space *mapping,
 			   loff_t pos, loff_t count);
 void set_page_dirty_balance(struct page *page);
+void writeback_set_ratelimit(void);
 
 /* pdflush.c */
 extern int nr_pdflush_threads;	/* Global so it can be exported to sysctl
diff -puN mm/memory_hotplug.c~call-mm-page-writebackcset_ratelimit-when-new-pages-tidy mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~call-mm-page-writebackcset_ratelimit-when-new-pages-tidy
+++ a/mm/memory_hotplug.c
@@ -13,6 +13,7 @@
 #include <linux/compiler.h>
 #include <linux/module.h>
 #include <linux/pagevec.h>
+#include <linux/writeback.h>
 #include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <linux/cpu.h>
@@ -169,7 +170,6 @@ int online_pages(unsigned long pfn, unsi
 	unsigned long start_pfn;
 	struct zone *zone;
 	int need_zonelists_rebuild = 0;
-	extern void set_ratelimit(void);
 
 	/*
 	 * This doesn't need a lock to do pfn_to_page().
@@ -220,7 +220,7 @@ int online_pages(unsigned long pfn, unsi
 	if (need_zonelists_rebuild)
 		build_all_zonelists();
 	vm_total_pages = nr_free_pagecache_pages();
-	set_ratelimit();
+	writeback_set_ratelimit();
 	return 0;
 }
 #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
diff -puN mm/page-writeback.c~call-mm-page-writebackcset_ratelimit-when-new-pages-tidy mm/page-writeback.c
--- a/mm/page-writeback.c~call-mm-page-writebackcset_ratelimit-when-new-pages-tidy
+++ a/mm/page-writeback.c
@@ -503,7 +503,7 @@ void laptop_sync_completion(void)
  * will write six megabyte chunks, max.
  */
 
-void set_ratelimit(void)
+void writeback_set_ratelimit(void)
 {
 	ratelimit_pages = vm_total_pages / (num_online_cpus() * 32);
 	if (ratelimit_pages < 16)
@@ -515,7 +515,7 @@ void set_ratelimit(void)
 static int __cpuinit
 ratelimit_handler(struct notifier_block *self, unsigned long u, void *v)
 {
-	set_ratelimit();
+	writeback_set_ratelimit();
 	return 0;
 }
 
@@ -548,7 +548,7 @@ void __init page_writeback_init(void)
 			vm_dirty_ratio = 1;
 	}
 	mod_timer(&wb_timer, jiffies + dirty_writeback_interval);
-	set_ratelimit();
+	writeback_set_ratelimit();
 	register_cpu_notifier(&ratelimit_nb);
 }
 
_