aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2012-06-22 23:33:51 -0400
committerCong Wang <amwang@redhat.com>2012-07-24 03:27:34 -0400
commit2164d3344693d2d4799fe91836d61f55516cbdf0 (patch)
tree842b96f9d534c78bea6c41243adc49fa528911de
parenta8e5202d09c1bac5b83889e1ddeff146eb421565 (diff)
pipe: remove KM_USER0 from comments
Signed-off-by: Cong Wang <amwang@redhat.com>
-rw-r--r--fs/pipe.c2
-rw-r--r--include/linux/pipe_fs_i.h8
2 files changed, 4 insertions, 6 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index 49c1065256fd..95cbd6b227e6 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -224,7 +224,7 @@ static void anon_pipe_buf_release(struct pipe_inode_info *pipe,
224 * and the caller has to be careful not to fault before calling 224 * and the caller has to be careful not to fault before calling
225 * the unmap function. 225 * the unmap function.
226 * 226 *
227 * Note that this function occupies KM_USER0 if @atomic != 0. 227 * Note that this function calls kmap_atomic() if @atomic != 0.
228 */ 228 */
229void *generic_pipe_buf_map(struct pipe_inode_info *pipe, 229void *generic_pipe_buf_map(struct pipe_inode_info *pipe,
230 struct pipe_buffer *buf, int atomic) 230 struct pipe_buffer *buf, int atomic)
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index e1ac1ce16fb0..e11d1c0fc60f 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -86,11 +86,9 @@ struct pipe_buf_operations {
86 * mapping or not. The atomic map is faster, however you can't take 86 * mapping or not. The atomic map is faster, however you can't take
87 * page faults before calling ->unmap() again. So if you need to eg 87 * page faults before calling ->unmap() again. So if you need to eg
88 * access user data through copy_to/from_user(), then you must get 88 * access user data through copy_to/from_user(), then you must get
89 * a non-atomic map. ->map() uses the KM_USER0 atomic slot for 89 * a non-atomic map. ->map() uses the kmap_atomic slot for
90 * atomic maps, so you can't map more than one pipe_buffer at once 90 * atomic maps, you have to be careful if mapping another page as
91 * and you have to be careful if mapping another page as source 91 * source or destination for a copy.
92 * or destination for a copy (IOW, it has to use something else
93 * than KM_USER0).
94 */ 92 */
95 void * (*map)(struct pipe_inode_info *, struct pipe_buffer *, int); 93 void * (*map)(struct pipe_inode_info *, struct pipe_buffer *, int);
96 94