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

[karo-tx-linux.git] / include / linux / pipe_fs_i.h

diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index e16dcb31f0c7c3c3358c52b747b493d96cf92cca..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);