Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 8eac563c1c3a2047083022357ae63722b19e4e08

Authored by Andi Kleen
Committed by Linus Torvalds
1 parent 7137c6bd45
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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: Andi Kleen <ak@linux.intel.com>
Reviewed-by: Christoph Lameter <cl@linux.com>
Acked-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -1830,7 +1830,7 @@
1830 1830 if (unlikely(pol->mode == MPOL_INTERLEAVE)) {
1831 1831 unsigned nid;
1832 1832  
1833   - nid = interleave_nid(pol, vma, addr, PAGE_SHIFT);
  1833 + nid = interleave_nid(pol, vma, addr, PAGE_SHIFT + order);
1834 1834 mpol_cond_put(pol);
1835 1835 page = alloc_page_interleave(gfp, order, nid);
1836 1836 put_mems_allowed();