net: make struct request_sock_ops::obj_size unsigned

[karo-tx-linux.git] / mm / khugepaged.c

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 7cb9c88bb4a33ca11c3266f398ffffb53c5afc13..945fd1ca49b5af0bc3b87dbfe8098f0f602775a2 100644 (file)
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -612,7 +612,8 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page,
                                      spinlock_t *ptl)
 {
        pte_t *_pte;
-       for (_pte = pte; _pte < pte+HPAGE_PMD_NR; _pte++) {
+       for (_pte = pte; _pte < pte + HPAGE_PMD_NR;
+                               _pte++, page++, address += PAGE_SIZE) {
                pte_t pteval = *_pte;
                struct page *src_page;
 
@@ -651,9 +652,7 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page,
                        spin_unlock(ptl);
                        free_page_and_swap_cache(src_page);
                }
-
-               address += PAGE_SIZE;
-               page++;
+               cond_resched();
        }
 }
 
@@ -907,8 +906,10 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm,
                                return false;
                        }
                        /* check if the pmd is still valid */
-                       if (mm_find_pmd(mm, address) != pmd)
+                       if (mm_find_pmd(mm, address) != pmd) {
+                               trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);
                                return false;
+                       }
                }
                if (ret & VM_FAULT_ERROR) {
                        trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);