Merge branch 'kmap_atomic' of git://github.com/congwang/linux

Pull final kmap_atomic cleanups from Cong Wang:
 "This should be the final round of cleanup, as the definitions of enum
  km_type finally get removed from the whole tree.  The patches have
  been in linux-next for a long time."

* 'kmap_atomic' of git://github.com/congwang/linux:
  pipe: remove KM_USER0 from comments
  vmalloc: remove KM_USER0 from comments
  feature-removal-schedule.txt: remove kmap_atomic(page, km_type)
  tile: remove km_type definitions
  um: remove km_type definitions
  asm-generic: remove km_type definitions
  avr32: remove km_type definitions
  frv: remove km_type definitions
  powerpc: remove km_type definitions
  arm: remove km_type definitions
  highmem: remove the deprecated form of kmap_atomic
  tile: remove usage of enum km_type
  frv: remove the second parameter of kmap_atomic_primary()
  jbd2: remove the second argument of kmap_atomic

2 files changed, 3 insertions, 3 deletions

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 216f4299f65..af5280fb579 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -349,12 +349,12 @@ static void jbd2_block_tag_csum_set(journal_t *j, journal_block_tag_t *tag,
                 return;
 
         sequence = cpu_to_be32(sequence);
-        addr = kmap_atomic(page, KM_USER0);
+        addr = kmap_atomic(page);
         csum = jbd2_chksum(j, j->j_csum_seed, (__u8 *)&sequence,
                           sizeof(sequence));
         csum = jbd2_chksum(j, csum, addr + offset_in_page(bh->b_data),
                           bh->b_size);
-        kunmap_atomic(addr, KM_USER0);
+        kunmap_atomic(addr);
 
         tag->t_checksum = cpu_to_be32(csum);
 }
diff --git a/fs/pipe.c b/fs/pipe.c
index 49c1065256f..95cbd6b227e 100644
--- 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)