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

[~andy/linux] / fs / pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index 7523d9d2a9988f4381350688e0b7bbf39e3b30b4..8d85d7068c1e8a0f028a7a72dba9c04c24e3ee91 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -224,7 +224,7 @@ static void anon_pipe_buf_release(struct pipe_inode_info *pipe,
  *     and the caller has to be careful not to fault before calling
  *     the unmap function.
  *
- *     Note that this function occupies KM_USER0 if @atomic != 0.
+ *     Note that this function calls kmap_atomic() if @atomic != 0.
  */
 void *generic_pipe_buf_map(struct pipe_inode_info *pipe,
                           struct pipe_buffer *buf, int atomic)