diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/hugetlb.c | 2 | ||||
-rw-r--r-- | mm/memory.c | 9 | ||||
-rw-r--r-- | mm/page_io.c | 2 | ||||
-rw-r--r-- | mm/swap_state.c | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index db861d8b6c28..1a5642074e34 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -813,6 +813,7 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, | |||
813 | 813 | ||
814 | spin_unlock(&mm->page_table_lock); | 814 | spin_unlock(&mm->page_table_lock); |
815 | copy_huge_page(new_page, old_page, address, vma); | 815 | copy_huge_page(new_page, old_page, address, vma); |
816 | __SetPageUptodate(new_page); | ||
816 | spin_lock(&mm->page_table_lock); | 817 | spin_lock(&mm->page_table_lock); |
817 | 818 | ||
818 | ptep = huge_pte_offset(mm, address & HPAGE_MASK); | 819 | ptep = huge_pte_offset(mm, address & HPAGE_MASK); |
@@ -858,6 +859,7 @@ retry: | |||
858 | goto out; | 859 | goto out; |
859 | } | 860 | } |
860 | clear_huge_page(page, address); | 861 | clear_huge_page(page, address); |
862 | __SetPageUptodate(page); | ||
861 | 863 | ||
862 | if (vma->vm_flags & VM_SHARED) { | 864 | if (vma->vm_flags & VM_SHARED) { |
863 | int err; | 865 | int err; |
diff --git a/mm/memory.c b/mm/memory.c index 6a9c048f6012..7bb70728bb52 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1518,10 +1518,8 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo | |||
1518 | memset(kaddr, 0, PAGE_SIZE); | 1518 | memset(kaddr, 0, PAGE_SIZE); |
1519 | kunmap_atomic(kaddr, KM_USER0); | 1519 | kunmap_atomic(kaddr, KM_USER0); |
1520 | flush_dcache_page(dst); | 1520 | flush_dcache_page(dst); |
1521 | return; | 1521 | } else |
1522 | 1522 | copy_user_highpage(dst, src, va, vma); | |
1523 | } | ||
1524 | copy_user_highpage(dst, src, va, vma); | ||
1525 | } | 1523 | } |
1526 | 1524 | ||
1527 | /* | 1525 | /* |
@@ -1630,6 +1628,7 @@ gotten: | |||
1630 | if (!new_page) | 1628 | if (!new_page) |
1631 | goto oom; | 1629 | goto oom; |
1632 | cow_user_page(new_page, old_page, address, vma); | 1630 | cow_user_page(new_page, old_page, address, vma); |
1631 | __SetPageUptodate(new_page); | ||
1633 | 1632 | ||
1634 | /* | 1633 | /* |
1635 | * Re-check the pte - we dropped the lock | 1634 | * Re-check the pte - we dropped the lock |
@@ -2102,6 +2101,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
2102 | page = alloc_zeroed_user_highpage_movable(vma, address); | 2101 | page = alloc_zeroed_user_highpage_movable(vma, address); |
2103 | if (!page) | 2102 | if (!page) |
2104 | goto oom; | 2103 | goto oom; |
2104 | __SetPageUptodate(page); | ||
2105 | 2105 | ||
2106 | entry = mk_pte(page, vma->vm_page_prot); | 2106 | entry = mk_pte(page, vma->vm_page_prot); |
2107 | entry = maybe_mkwrite(pte_mkdirty(entry), vma); | 2107 | entry = maybe_mkwrite(pte_mkdirty(entry), vma); |
@@ -2202,6 +2202,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
2202 | goto out; | 2202 | goto out; |
2203 | } | 2203 | } |
2204 | copy_user_highpage(page, vmf.page, address, vma); | 2204 | copy_user_highpage(page, vmf.page, address, vma); |
2205 | __SetPageUptodate(page); | ||
2205 | } else { | 2206 | } else { |
2206 | /* | 2207 | /* |
2207 | * If the page will be shareable, see if the backing | 2208 | * If the page will be shareable, see if the backing |
diff --git a/mm/page_io.c b/mm/page_io.c index 3b97f6850273..065c4480eaf0 100644 --- a/mm/page_io.c +++ b/mm/page_io.c | |||
@@ -126,7 +126,7 @@ int swap_readpage(struct file *file, struct page *page) | |||
126 | int ret = 0; | 126 | int ret = 0; |
127 | 127 | ||
128 | BUG_ON(!PageLocked(page)); | 128 | BUG_ON(!PageLocked(page)); |
129 | ClearPageUptodate(page); | 129 | BUG_ON(PageUptodate(page)); |
130 | bio = get_swap_bio(GFP_KERNEL, page_private(page), page, | 130 | bio = get_swap_bio(GFP_KERNEL, page_private(page), page, |
131 | end_swap_bio_read); | 131 | end_swap_bio_read); |
132 | if (bio == NULL) { | 132 | if (bio == NULL) { |
diff --git a/mm/swap_state.c b/mm/swap_state.c index 65b81c92738f..ec42f01a8d02 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c | |||
@@ -125,6 +125,7 @@ int add_to_swap(struct page * page, gfp_t gfp_mask) | |||
125 | int err; | 125 | int err; |
126 | 126 | ||
127 | BUG_ON(!PageLocked(page)); | 127 | BUG_ON(!PageLocked(page)); |
128 | BUG_ON(!PageUptodate(page)); | ||
128 | 129 | ||
129 | for (;;) { | 130 | for (;;) { |
130 | entry = get_swap_page(); | 131 | entry = get_swap_page(); |
@@ -147,7 +148,6 @@ int add_to_swap(struct page * page, gfp_t gfp_mask) | |||
147 | 148 | ||
148 | switch (err) { | 149 | switch (err) { |
149 | case 0: /* Success */ | 150 | case 0: /* Success */ |
150 | SetPageUptodate(page); | ||
151 | SetPageDirty(page); | 151 | SetPageDirty(page); |
152 | return 1; | 152 | return 1; |
153 | case -EEXIST: | 153 | case -EEXIST: |