---

yaml --- r: 33769 b: refs/heads/master c: 3b98b08 h: refs/heads/master i: 33767: f5a1de8 v: v3
git-mirror · Sep 1, 2006 · 8b7f79f · 8b7f79f
1 parent ae77474
commit 8b7f79f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1678df37be8abbb381becdc40242ed915e775550
+refs/heads/master: 3b98b087fc2daab67518d2baa8aef19a6ad82723
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
@@ -1176,7 +1176,15 @@ static inline unsigned interleave_nid(struct mempolicy *pol,
 	if (vma) {
 		unsigned long off;
 
-		off = vma->vm_pgoff;
+		/*
+		 * for small pages, there is no difference between
+		 * shift and PAGE_SHIFT, so the bit-shift is safe.
+		 * for huge pages, since vm_pgoff is in units of small
+		 * pages, we need to shift off the always 0 bits to get
+		 * a useful offset.
+		 */
+		BUG_ON(shift < PAGE_SHIFT);
+		off = vma->vm_pgoff >> (shift - PAGE_SHIFT);
 		off += (addr - vma->vm_start) >> shift;
 		return offset_il_node(pol, vma, off);
 	} else