Merge branch 'for-rmk' of git://git.android.com/kernel into devel

1 files changed, 4 insertions, 0 deletions

diff --git a/mm/truncate.c b/mm/truncate.c
index e83e4b114ef1..1229211104f8 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -18,6 +18,7 @@
 #include <linux/task_io_accounting_ops.h>
 #include <linux/buffer_head.h>  /* grr. try_to_release_page,
                                    do_invalidatepage */
+#include "internal.h"
 
 
 /**
@@ -103,6 +104,7 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
 
         cancel_dirty_page(page, PAGE_CACHE_SIZE);
 
+        clear_page_mlock(page);
         remove_from_page_cache(page);
         ClearPageMappedToDisk(page);
         page_cache_release(page);       /* pagecache ref */
@@ -127,6 +129,7 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
         if (PagePrivate(page) && !try_to_release_page(page, 0))
                 return 0;
 
+        clear_page_mlock(page);
         ret = remove_mapping(mapping, page);
 
         return ret;
@@ -352,6 +355,7 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page)
         if (PageDirty(page))
                 goto failed;
 
+        clear_page_mlock(page);
         BUG_ON(PagePrivate(page));
         __remove_from_page_cache(page);
         spin_unlock_irq(&mapping->tree_lock);