Skip to contentSkip to conversation

powerpc/mm: Fix hugetlb page initialization

PATCH Applied Sachin Sant 3 participants 3 messages May 6, 2019 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/mm: Fix hugetlb page initialization

This patch fixes a regression by using correct kernel config variable for HUGETLB_PAGE_SIZE_VARIABLE.

Without this huge pages are disabled during kernel boot.

[0.309496] hugetlbfs: disabling because there are no supported hugepage sizes
Fixes c5710cd20735 ("powerpc/mm: cleanup HPAGE_SHIFT setup")

---

arch/powerpc/mm/hugetlbpage.c +1 -1
diff -Narup a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
@@ -640,7 +640,7 @@ static int __init hugetlbpage_init(void)
 			pgtable_cache_add(PTE_T_ORDER);
 	}
 
-	if (IS_ENABLED(HUGETLB_PAGE_SIZE_VARIABLE))
+	if (IS_ENABLED(CONFIG_HUGETLB_PAGE_SIZE_VARIABLE))
 		hugetlbpage_init_default();
 
 	return 0;
Reviewed-by on v1 1/1
#1 lore raw

Le 06/05/2019 à 14:03, Sachin Sant a écrit :

Quoted 10 lines

This patch fixes a regression by using correct kernel config variable for HUGETLB_PAGE_SIZE_VARIABLE.

Without this huge pages are disabled during kernel boot.

[0.309496] hugetlbfs: disabling because there are no supported hugepage sizes
Fixes c5710cd20735 ("powerpc/mm: cleanup HPAGE_SHIFT setup")
Quoted 15 lines

---
diff -Narup a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c

arch/powerpc/mm/hugetlbpage.c +1 -1
@@ -640,7 +640,7 @@ static int __init hugetlbpage_init(void)
  			pgtable_cache_add(PTE_T_ORDER);
  	}
 
-	if (IS_ENABLED(HUGETLB_PAGE_SIZE_VARIABLE))
+	if (IS_ENABLED(CONFIG_HUGETLB_PAGE_SIZE_VARIABLE))
  		hugetlbpage_init_default();
 
  	return 0;
#2 lore raw
In reply to Sachin Sant
Quoted 11 lines · Sachin Sant

This patch fixes a regression by using correct kernel config variable for HUGETLB_PAGE_SIZE_VARIABLE.

Without this huge pages are disabled during kernel boot.

[0.309496] hugetlbfs: disabling because there are no supported hugepage sizes
Fixes c5710cd20735 ("powerpc/mm: cleanup HPAGE_SHIFT setup")

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/04a1942933ced67d2b73c156017bf134

cheers