From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755868Ab1BWBwj (ORCPT ); Tue, 22 Feb 2011 20:52:39 -0500 Received: from mga02.intel.com ([134.134.136.20]:39482 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753475Ab1BWBwg (ORCPT ); Tue, 22 Feb 2011 20:52:36 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.62,209,1297065600"; d="scan'208";a="712021904" From: Andi Kleen To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andi Kleen , aarcange@redhat.com Subject: [PATCH 1/8] Fix interleaving for transparent hugepages v2 Date: Tue, 22 Feb 2011 17:51:55 -0800 Message-Id: <1298425922-23630-2-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1298425922-23630-1-git-send-email-andi@firstfloor.org> References: <1298425922-23630-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Bugfix, independent from the rest of the series. The THP code didn't pass the correct interleaving shift to the memory policy code. Fix this here by adjusting for the order. v2: Use + (thanks Christoph) Cc: aarcange@redhat.com Signed-off-by: Andi Kleen --- mm/mempolicy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 368fc9d..49355a9 100644 --- a/mm/mempolicy.c +++ b/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(); -- 1.7.4