From 5eacfa1b0befccefa2ae03c92014f83edb7d7dc0 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Fri, 25 Feb 2011 14:44:28 -0800
Subject: [PATCH] --- yaml --- r: 233701 b: refs/heads/master c:
 8eac563c1c3a2047083022357ae63722b19e4e08 h: refs/heads/master i:   233699:
 a4fbc1fa507d65b0969fd71d624c299667120443 v: v3

---
 [refs]               | 2 +-
 trunk/mm/mempolicy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b9bd9cea55ba..d0c5291e68db 100644
--- 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
index 368fc9d23610..49355a970be2 100644
--- 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();