---

yaml --- r: 272166 b: refs/heads/master c: 0089e48 h: refs/heads/master v: v3
git-mirror · Nov 1, 2011 · e80e2a7 · e80e2a7
1 parent b4ec693
commit e80e2a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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();
 	}