---

yaml --- r: 233701 b: refs/heads/master c: 8eac563 h: refs/heads/master i: 233699: a4fbc1f v: v3
git-mirror · Feb 25, 2011 · 5eacfa1 · 5eacfa1
1 parent 2294ad9
commit 5eacfa1
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: 7137c6bd455234bcb7560fd829e6ee49cae5fed6
+refs/heads/master: 8eac563c1c3a2047083022357ae63722b19e4e08
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
@@ -1830,7 +1830,7 @@ alloc_pages_vma(gfp_t gfp, int order, struct vm_area_struct *vma,
 	if (unlikely(pol->mode == MPOL_INTERLEAVE)) {
 		unsigned nid;
 
-		nid = interleave_nid(pol, vma, addr, PAGE_SHIFT);
+		nid = interleave_nid(pol, vma, addr, PAGE_SHIFT + order);
 		mpol_cond_put(pol);
 		page = alloc_page_interleave(gfp, order, nid);
 		put_mems_allowed();