Auto merge with /home/aegl/GIT/linus

2 files changed, 2 insertions, 2 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 613b99a55917..a6329fa8f862 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -354,7 +354,7 @@ static void background_writeout(unsigned long _min_pages)
  * the whole world.  Returns 0 if a pdflush thread was dispatched.  Returns
  * -1 if all pdflush threads were busy.
  */
-int wakeup_bdflush(long nr_pages)
+int wakeup_pdflush(long nr_pages)
 {
         if (nr_pages == 0) {
                 struct writeback_state wbs;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 1fa312a8db77..cfffe5098d53 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -972,7 +972,7 @@ int try_to_free_pages(struct zone **zones, unsigned int gfp_mask)
                  * writeout.  So in laptop mode, write out the whole world.
                  */
                 if (total_scanned > sc.swap_cluster_max + sc.swap_cluster_max/2) {
-                        wakeup_bdflush(laptop_mode ? 0 : total_scanned);
+                        wakeup_pdflush(laptop_mode ? 0 : total_scanned);
                         sc.may_writepage = 1;
                 }