Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / linux / rmap.h

diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index 11b484e37ac94fcd2308a354d372f00faff8a736..e80fb7ee6efdf5617f49f439ac4eafe28e86dfc1 100644 (file)
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -92,6 +92,12 @@ static inline void page_dup_rmap(struct page *page)
 int page_referenced(struct page *, int is_locked, int ignore_token);
 int try_to_unmap(struct page *);
 
+/*
+ * Called from mm/filemap_xip.c to unmap empty zero page
+ */
+pte_t *page_check_address(struct page *, struct mm_struct *, unsigned long);
+
+
 /*
  * Used by swapoff to help locate where page is expected in vma.
  */