Commit 3ecb01df3261d3b1f02ccfcf8384e2a255d2a1d0
Committed by
Linus Torvalds
Linus Torvalds
1 parent
b647277681
Exists in
master
and in
4 other branches
use clear_page()/copy_page() in favor of memset()/memcpy() on whole pages
After all that's what they are intended for. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: Miklos Szeredi <miklos@szeredi.hu> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 5 changed files with 13 additions and 13 deletions Side-by-side Diff
fs/fuse/dev.c
kernel/kexec.c
kernel/power/snapshot.c
| ... | ... | @@ -993,7 +993,7 @@ |
| 993 | 993 | */ |
| 994 | 994 | safe_copy_page(buffer, s_page); |
| 995 | 995 | dst = kmap_atomic(d_page, KM_USER0); |
| 996 | - memcpy(dst, buffer, PAGE_SIZE); | |
| 996 | + copy_page(dst, buffer); | |
| 997 | 997 | kunmap_atomic(dst, KM_USER0); |
| 998 | 998 | } else { |
| 999 | 999 | safe_copy_page(page_address(d_page), s_page); |
| ... | ... | @@ -1687,7 +1687,7 @@ |
| 1687 | 1687 | memory_bm_position_reset(&orig_bm); |
| 1688 | 1688 | memory_bm_position_reset(©_bm); |
| 1689 | 1689 | } else if (handle->cur <= nr_meta_pages) { |
| 1690 | - memset(buffer, 0, PAGE_SIZE); | |
| 1690 | + clear_page(buffer); | |
| 1691 | 1691 | pack_pfns(buffer, &orig_bm); |
| 1692 | 1692 | } else { |
| 1693 | 1693 | struct page *page; |
| ... | ... | @@ -1701,7 +1701,7 @@ |
| 1701 | 1701 | void *kaddr; |
| 1702 | 1702 | |
| 1703 | 1703 | kaddr = kmap_atomic(page, KM_USER0); |
| 1704 | - memcpy(buffer, kaddr, PAGE_SIZE); | |
| 1704 | + copy_page(buffer, kaddr); | |
| 1705 | 1705 | kunmap_atomic(kaddr, KM_USER0); |
| 1706 | 1706 | handle->buffer = buffer; |
| 1707 | 1707 | } else { |
| ... | ... | @@ -1984,7 +1984,7 @@ |
| 1984 | 1984 | void *dst; |
| 1985 | 1985 | |
| 1986 | 1986 | dst = kmap_atomic(last_highmem_page, KM_USER0); |
| 1987 | - memcpy(dst, buffer, PAGE_SIZE); | |
| 1987 | + copy_page(dst, buffer); | |
| 1988 | 1988 | kunmap_atomic(dst, KM_USER0); |
| 1989 | 1989 | last_highmem_page = NULL; |
| 1990 | 1990 | } |
| ... | ... | @@ -2270,9 +2270,9 @@ |
| 2270 | 2270 | |
| 2271 | 2271 | kaddr1 = kmap_atomic(p1, KM_USER0); |
| 2272 | 2272 | kaddr2 = kmap_atomic(p2, KM_USER1); |
| 2273 | - memcpy(buf, kaddr1, PAGE_SIZE); | |
| 2274 | - memcpy(kaddr1, kaddr2, PAGE_SIZE); | |
| 2275 | - memcpy(kaddr2, buf, PAGE_SIZE); | |
| 2273 | + copy_page(buf, kaddr1); | |
| 2274 | + copy_page(kaddr1, kaddr2); | |
| 2275 | + copy_page(kaddr2, buf); | |
| 2276 | 2276 | kunmap_atomic(kaddr2, KM_USER1); |
| 2277 | 2277 | kunmap_atomic(kaddr1, KM_USER0); |
| 2278 | 2278 | } |
kernel/power/swap.c
| ... | ... | @@ -251,7 +251,7 @@ |
| 251 | 251 | if (bio_chain) { |
| 252 | 252 | src = (void *)__get_free_page(__GFP_WAIT | __GFP_HIGH); |
| 253 | 253 | if (src) { |
| 254 | - memcpy(src, buf, PAGE_SIZE); | |
| 254 | + copy_page(src, buf); | |
| 255 | 255 | } else { |
| 256 | 256 | WARN_ON_ONCE(1); |
| 257 | 257 | bio_chain = NULL; /* Go synchronous */ |
| ... | ... | @@ -325,7 +325,7 @@ |
| 325 | 325 | error = write_page(handle->cur, handle->cur_swap, NULL); |
| 326 | 326 | if (error) |
| 327 | 327 | goto out; |
| 328 | - memset(handle->cur, 0, PAGE_SIZE); | |
| 328 | + clear_page(handle->cur); | |
| 329 | 329 | handle->cur_swap = offset; |
| 330 | 330 | handle->k = 0; |
| 331 | 331 | } |
| ... | ... | @@ -910,7 +910,7 @@ |
| 910 | 910 | hib_resume_bdev = open_by_devnum(swsusp_resume_device, FMODE_READ); |
| 911 | 911 | if (!IS_ERR(hib_resume_bdev)) { |
| 912 | 912 | set_blocksize(hib_resume_bdev, PAGE_SIZE); |
| 913 | - memset(swsusp_header, 0, PAGE_SIZE); | |
| 913 | + clear_page(swsusp_header); | |
| 914 | 914 | error = hib_bio_read_page(swsusp_resume_block, |
| 915 | 915 | swsusp_header, NULL); |
| 916 | 916 | if (error) |
mm/memory.c