Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / include / linux / pipe_fs_i.h

diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index e1ac1ce16fb0b60f07ec961b3ec8f1b7fb0763d0..ad1a427b5267b3faef96444289eacbaf62880f75 100644 (file)
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -86,11 +86,9 @@ struct pipe_buf_operations {
         * mapping or not. The atomic map is faster, however you can't take
         * page faults before calling ->unmap() again. So if you need to eg
         * access user data through copy_to/from_user(), then you must get
-        * a non-atomic map. ->map() uses the KM_USER0 atomic slot for
-        * atomic maps, so you can't map more than one pipe_buffer at once
-        * and you have to be careful if mapping another page as source
-        * or destination for a copy (IOW, it has to use something else
-        * than KM_USER0).
+        * a non-atomic map. ->map() uses the kmap_atomic slot for
+        * atomic maps, you have to be careful if mapping another page as
+        * source or destination for a copy.
         */
        void * (*map)(struct pipe_inode_info *, struct pipe_buffer *, int);
 
@@ -162,4 +160,6 @@ void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *);
 long pipe_fcntl(struct file *, unsigned int, unsigned long arg);
 struct pipe_inode_info *get_pipe_info(struct file *file);
 
+int create_pipe_files(struct file **, int);
+
 #endif