Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eac563c authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

thp: fix interleaving for transparent hugepages 



The THP code didn't pass the correct interleaving shift to the memory
policy code.  Fix this here by adjusting for the order.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Reviewed-by: default avatarChristoph Lameter <cl@linux.com>
Acked-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7137c6bd

mm/mempolicy.c

+1 −1
Original line number Diff line number Diff line
@@ -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();