[PATCH] pfnmap: remove src_page from do_wp_page

Clean away do_wp_page's "src_page": cow_user_page makes it unnecessary.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Hugh Dickins and committed by Linus Torvalds e5bbe4df 5d2a2dbb

+3 -4
+3 -4
mm/memory.c
··· 1433 unsigned long address, pte_t *page_table, pmd_t *pmd, 1434 spinlock_t *ptl, pte_t orig_pte) 1435 { 1436 - struct page *old_page, *src_page, *new_page; 1437 pte_t entry; 1438 int ret = VM_FAULT_MINOR; 1439 1440 old_page = vm_normal_page(vma, address, orig_pte); 1441 - src_page = old_page; 1442 if (!old_page) 1443 goto gotten; 1444 ··· 1465 1466 if (unlikely(anon_vma_prepare(vma))) 1467 goto oom; 1468 - if (src_page == ZERO_PAGE(address)) { 1469 new_page = alloc_zeroed_user_highpage(vma, address); 1470 if (!new_page) 1471 goto oom; ··· 1473 new_page = alloc_page_vma(GFP_HIGHUSER, vma, address); 1474 if (!new_page) 1475 goto oom; 1476 - cow_user_page(new_page, src_page, address); 1477 } 1478 1479 /*
··· 1433 unsigned long address, pte_t *page_table, pmd_t *pmd, 1434 spinlock_t *ptl, pte_t orig_pte) 1435 { 1436 + struct page *old_page, *new_page; 1437 pte_t entry; 1438 int ret = VM_FAULT_MINOR; 1439 1440 old_page = vm_normal_page(vma, address, orig_pte); 1441 if (!old_page) 1442 goto gotten; 1443 ··· 1466 1467 if (unlikely(anon_vma_prepare(vma))) 1468 goto oom; 1469 + if (old_page == ZERO_PAGE(address)) { 1470 new_page = alloc_zeroed_user_highpage(vma, address); 1471 if (!new_page) 1472 goto oom; ··· 1474 new_page = alloc_page_vma(GFP_HIGHUSER, vma, address); 1475 if (!new_page) 1476 goto oom; 1477 + cow_user_page(new_page, old_page, address); 1478 } 1479 1480 /*