diff options
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/memory.c b/mm/memory.c index bf6100236e62..c00bac66ce9f 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1441,7 +1441,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) | |||
1441 | return pte; | 1441 | return pte; |
1442 | } | 1442 | } |
1443 | 1443 | ||
1444 | static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va) | 1444 | static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va, struct vm_area_struct *vma) |
1445 | { | 1445 | { |
1446 | /* | 1446 | /* |
1447 | * If the source page was a PFN mapping, we don't have | 1447 | * If the source page was a PFN mapping, we don't have |
@@ -1464,9 +1464,9 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo | |||
1464 | kunmap_atomic(kaddr, KM_USER0); | 1464 | kunmap_atomic(kaddr, KM_USER0); |
1465 | flush_dcache_page(dst); | 1465 | flush_dcache_page(dst); |
1466 | return; | 1466 | return; |
1467 | 1467 | ||
1468 | } | 1468 | } |
1469 | copy_user_highpage(dst, src, va); | 1469 | copy_user_highpage(dst, src, va, vma); |
1470 | } | 1470 | } |
1471 | 1471 | ||
1472 | /* | 1472 | /* |
@@ -1577,7 +1577,7 @@ gotten: | |||
1577 | new_page = alloc_page_vma(GFP_HIGHUSER, vma, address); | 1577 | new_page = alloc_page_vma(GFP_HIGHUSER, vma, address); |
1578 | if (!new_page) | 1578 | if (!new_page) |
1579 | goto oom; | 1579 | goto oom; |
1580 | cow_user_page(new_page, old_page, address); | 1580 | cow_user_page(new_page, old_page, address, vma); |
1581 | } | 1581 | } |
1582 | 1582 | ||
1583 | /* | 1583 | /* |
@@ -2200,7 +2200,7 @@ retry: | |||
2200 | page = alloc_page_vma(GFP_HIGHUSER, vma, address); | 2200 | page = alloc_page_vma(GFP_HIGHUSER, vma, address); |
2201 | if (!page) | 2201 | if (!page) |
2202 | goto oom; | 2202 | goto oom; |
2203 | copy_user_highpage(page, new_page, address); | 2203 | copy_user_highpage(page, new_page, address, vma); |
2204 | page_cache_release(new_page); | 2204 | page_cache_release(new_page); |
2205 | new_page = page; | 2205 | new_page = page; |
2206 | anon = 1; | 2206 | anon = 1; |