Merge branch 'linus' into perfcounters/core

[linux-2.6-block.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index d88d6fc530ade07b88272c033804404c064c2440..cf260d848eb925edf884e4d82a8477a1f890f6f4 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -853,6 +853,12 @@ extern int mprotect_fixup(struct vm_area_struct *vma,
                          struct vm_area_struct **pprev, unsigned long start,
                          unsigned long end, unsigned long newflags);
 
+/*
+ * doesn't attempt to fault and will return short.
+ */
+int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
+                         struct page **pages);
+
 /*
  * A callback you can register to apply pressure to ageable caches.
  *