Skip to content

Commit 489c693

Browse files
Chen Haonanrafaeljw
authored andcommitted
PM: hibernate: Use kmap_local_page() in copy_data_page()
kmap_atomic() has been deprecated in favor of kmap_local_page(). kmap_atomic() disables page-faults and preemption (the latter only for !PREEMPT_RT kernels).The code between the mapping and un-mapping in this patch does not depend on the above-mentioned side effects.So simply replaced kmap_atomic() with kmap_local_page(). Signed-off-by: Chen Haonan <chen.haonan2@zte.com.cn> [ rjw: Subject edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 71cd7e8 commit 489c693

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

kernel/power/snapshot.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,21 +1487,21 @@ static bool copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
14871487
s_page = pfn_to_page(src_pfn);
14881488
d_page = pfn_to_page(dst_pfn);
14891489
if (PageHighMem(s_page)) {
1490-
src = kmap_atomic(s_page);
1491-
dst = kmap_atomic(d_page);
1490+
src = kmap_local_page(s_page);
1491+
dst = kmap_local_page(d_page);
14921492
zeros_only = do_copy_page(dst, src);
1493-
kunmap_atomic(dst);
1494-
kunmap_atomic(src);
1493+
kunmap_local(dst);
1494+
kunmap_local(src);
14951495
} else {
14961496
if (PageHighMem(d_page)) {
14971497
/*
14981498
* The page pointed to by src may contain some kernel
14991499
* data modified by kmap_atomic()
15001500
*/
15011501
zeros_only = safe_copy_page(buffer, s_page);
1502-
dst = kmap_atomic(d_page);
1502+
dst = kmap_local_page(d_page);
15031503
copy_page(dst, buffer);
1504-
kunmap_atomic(dst);
1504+
kunmap_local(dst);
15051505
} else {
15061506
zeros_only = safe_copy_page(page_address(d_page), s_page);
15071507
}

0 commit comments

Comments
 (0)