diff --git a/[refs] b/[refs] index 5b0728ede8df..6d3f27ce02a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df9d6985be2a7e7683c46e4c6ea608fc69f02b45 +refs/heads/master: 0089e4853ae1ac161fae5137170971ccb6f4f152 diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c index 44f57631cd7c..ef954384f53a 100644 --- a/trunk/mm/huge_memory.c +++ b/trunk/mm/huge_memory.c @@ -830,7 +830,7 @@ static int do_huge_pmd_wp_page_fallback(struct mm_struct *mm, for (i = 0; i < HPAGE_PMD_NR; i++) { copy_user_highpage(pages[i], page + i, - haddr + PAGE_SHIFT*i, vma); + haddr + PAGE_SIZE * i, vma); __SetPageUptodate(pages[i]); cond_resched(); }