Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 74dbdd239bb1348ad86d28b18574d9c1f28b62ca

Authored by Andrea Arcangeli
Committed by Linus Torvalds
1 parent b5430a04e9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mm: hugetlb: fix clear_huge_page() 

sz is in bytes, MAX_ORDER_NR_PAGES is in pages.

Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: David Gibson <dwg@au1.ibm.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: David Rientjes <rientjes@google.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.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

... ... @@ -402,7 +402,7 @@
402 402 {
403 403 int i;
404 404  
405   - if (unlikely(sz > MAX_ORDER_NR_PAGES)) {
  405 + if (unlikely(sz/PAGE_SIZE > MAX_ORDER_NR_PAGES)) {
406 406 clear_gigantic_page(page, addr, sz);
407 407 return;
408 408 }