X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Finternal.h;h=8562de0a5197d31e3621d10db8b0c01d23f44f83;hb=7f49ef69db6bbf756c0abca7e9b65b32e999eec8;hp=9ba21100ebf3b01bb0f2296baaf55ec41e303450;hpb=3e34c1fc2b51f117045e4a2472572f14ac91df6e;p=~andy%2Flinux

diff --git a/mm/internal.h b/mm/internal.h
index 9ba21100ebf..8562de0a519 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -162,8 +162,8 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
 		struct vm_area_struct *prev, struct rb_node *rb_parent);
 
 #ifdef CONFIG_MMU
-extern long mlock_vma_pages_range(struct vm_area_struct *vma,
-			unsigned long start, unsigned long end);
+extern long __mlock_vma_pages_range(struct vm_area_struct *vma,
+		unsigned long start, unsigned long end, int *nonblocking);
 extern void munlock_vma_pages_range(struct vm_area_struct *vma,
 			unsigned long start, unsigned long end);
 static inline void munlock_vma_pages_all(struct vm_area_struct *vma)
@@ -195,7 +195,7 @@ static inline int mlocked_vma_newpage(struct vm_area_struct *vma,
  * must be called with vma's mmap_sem held for read or write, and page locked.
  */
 extern void mlock_vma_page(struct page *page);
-extern void munlock_vma_page(struct page *page);
+extern unsigned int munlock_vma_page(struct page *page);
 
 /*
  * Clear the page's PageMlocked().  This can be useful in a situation where