X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2Ffilemap_xip.c;h=fb957bf11ce3819d96ddfd8e6681a56c72ebba55;hb=1bb1c71785da5d4c8a916d87ab68bc48e5103bd3;hp=b960ac8e5918dcb33e64b9b4f822f25540ddb4b4;hpb=4544ac5ae436e5ca8ac99f4296c50a5b880e349e;p=linux-2.6.git

diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index b960ac8e5..fb957bf11 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -13,6 +13,8 @@
 #include <linux/module.h>
 #include <linux/uio.h>
 #include <linux/rmap.h>
+#include <linux/vs_base.h>
+#include <linux/vs_memory.h>
 #include <asm/tlbflush.h>
 #include "filemap.h"
 
@@ -189,7 +191,7 @@ __xip_unmap (struct address_space * mapping,
 			/* Nuke the page table entry. */
 			flush_cache_page(vma, address, pte_pfn(*pte));
 			pteval = ptep_clear_flush(vma, address, pte);
-			page_remove_rmap(page);
+			page_remove_rmap(page, vma);
 			dec_mm_counter(mm, file_rss);
 			BUG_ON(pte_dirty(pteval));
 			pte_unmap_unlock(pte, ptl);
@@ -273,7 +275,7 @@ __xip_file_write(struct file *filp, const char __user *buf,
 		  size_t count, loff_t pos, loff_t *ppos)
 {
 	struct address_space * mapping = filp->f_mapping;
-	struct address_space_operations *a_ops = mapping->a_ops;
+	const struct address_space_operations *a_ops = mapping->a_ops;
 	struct inode 	*inode = mapping->host;
 	long		status = 0;
 	struct page	*page;