diff options
| author | Cong Wang <amwang@redhat.com> | 2011-11-25 23:14:39 +0800 | 
|---|---|---|
| committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 21:48:27 +0800 | 
| commit | 9b04c5fec43c0da610a2c37f70c5b013101a6ad7 (patch) | |
| tree | f04767281b7067fba91cf0d37440bf454c492e38 /mm/filemap.c | |
| parent | c3eede8e0a1292d95c051cf947738687b9c42322 (diff) | |
| download | olio-linux-3.10-9b04c5fec43c0da610a2c37f70c5b013101a6ad7.tar.xz olio-linux-3.10-9b04c5fec43c0da610a2c37f70c5b013101a6ad7.zip  | |
mm: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index b66275757c2..2f8165075a5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1318,10 +1318,10 @@ int file_read_actor(read_descriptor_t *desc, struct page *page,  	 * taking the kmap.  	 */  	if (!fault_in_pages_writeable(desc->arg.buf, size)) { -		kaddr = kmap_atomic(page, KM_USER0); +		kaddr = kmap_atomic(page);  		left = __copy_to_user_inatomic(desc->arg.buf,  						kaddr + offset, size); -		kunmap_atomic(kaddr, KM_USER0); +		kunmap_atomic(kaddr);  		if (left == 0)  			goto success;  	} @@ -2045,7 +2045,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,  	size_t copied;  	BUG_ON(!in_atomic()); -	kaddr = kmap_atomic(page, KM_USER0); +	kaddr = kmap_atomic(page);  	if (likely(i->nr_segs == 1)) {  		int left;  		char __user *buf = i->iov->iov_base + i->iov_offset; @@ -2055,7 +2055,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,  		copied = __iovec_copy_from_user_inatomic(kaddr + offset,  						i->iov, i->iov_offset, bytes);  	} -	kunmap_atomic(kaddr, KM_USER0); +	kunmap_atomic(kaddr);  	return copied;  }  |