lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

power: remove the second argument of k[un]map_atomic()

Browse Source 
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Cong Wang <amwang@redhat.com>
This commit is contained in:
Cong Wang
2011-11-25 23:14:38 +08:00
committed by Cong Wang
parent d762a50b5b
commit 0de9a1e28a
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/power/snapshot.c
View File

@@ -1000,20 +1000,20 @@ static void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
s_page = pfn_to_page(src_pfn); s_page = pfn_to_page(src_pfn);
d_page = pfn_to_page(dst_pfn); d_page = pfn_to_page(dst_pfn);
if (PageHighMem(s_page)) { if (PageHighMem(s_page)) {
src = kmap_atomic(s_page, KM_USER0); src = kmap_atomic(s_page);
dst = kmap_atomic(d_page, KM_USER1); dst = kmap_atomic(d_page);
do_copy_page(dst, src); do_copy_page(dst, src);
kunmap_atomic(dst, KM_USER1); kunmap_atomic(dst);
kunmap_atomic(src, KM_USER0); kunmap_atomic(src);
} else { } else {
if (PageHighMem(d_page)) { if (PageHighMem(d_page)) {
/* Page pointed to by src may contain some kernel /* Page pointed to by src may contain some kernel
* data modified by kmap_atomic() * data modified by kmap_atomic()
*/ */
safe_copy_page(buffer, s_page); safe_copy_page(buffer, s_page);
dst = kmap_atomic(d_page, KM_USER0); dst = kmap_atomic(d_page);
copy_page(dst, buffer); copy_page(dst, buffer);
kunmap_atomic(dst, KM_USER0); kunmap_atomic(dst);
} else { } else {
safe_copy_page(page_address(d_page), s_page); safe_copy_page(page_address(d_page), s_page);
} }
@@ -1728,9 +1728,9 @@ int snapshot_read_next(struct snapshot_handle *handle)
*/ */
void *kaddr; void *kaddr;
kaddr = kmap_atomic(page, KM_USER0); kaddr = kmap_atomic(page);
copy_page(buffer, kaddr); copy_page(buffer, kaddr);
kunmap_atomic(kaddr, KM_USER0); kunmap_atomic(kaddr);
handle->buffer = buffer; handle->buffer = buffer;
} else { } else {
handle->buffer = page_address(page); handle->buffer = page_address(page);
@@ -2014,9 +2014,9 @@ static void copy_last_highmem_page(void)
if (last_highmem_page) { if (last_highmem_page) {
void *dst; void *dst;
dst = kmap_atomic(last_highmem_page, KM_USER0); dst = kmap_atomic(last_highmem_page);
copy_page(dst, buffer); copy_page(dst, buffer);
kunmap_atomic(dst, KM_USER0); kunmap_atomic(dst);
last_highmem_page = NULL; last_highmem_page = NULL;
} }
} }
@@ -2309,13 +2309,13 @@ swap_two_pages_data(struct page *p1, struct page *p2, void *buf)
{ {
void *kaddr1, *kaddr2; void *kaddr1, *kaddr2;
kaddr1 = kmap_atomic(p1, KM_USER0); kaddr1 = kmap_atomic(p1);
kaddr2 = kmap_atomic(p2, KM_USER1); kaddr2 = kmap_atomic(p2);
copy_page(buf, kaddr1); copy_page(buf, kaddr1);
copy_page(kaddr1, kaddr2); copy_page(kaddr1, kaddr2);
copy_page(kaddr2, buf); copy_page(kaddr2, buf);
kunmap_atomic(kaddr2, KM_USER1); kunmap_atomic(kaddr2);
kunmap_atomic(kaddr1, KM_USER0); kunmap_atomic(kaddr1);
} }
/** /**