Commit 8399e4b8 authored by Nitin Gupta's avatar Nitin Gupta Committed by David S. Miller
Browse files

sparc64: Register hugepages during arch init

Add hstate for each supported hugepage size using
arch initcall. This change fixes some hugepage
parameter parsing inconsistencies:

case 1: no hugepage parameters

 Without hugepage parameters, only a hugepages-8192kB entry is visible
 in sysfs.  It's different from x86_64 where both 2M and 1G hugepage
 sizes are available.

case 2: default_hugepagesz=[64K|256M|2G]

 When specifying only a default_hugepagesz parameter, the default
 hugepage size isn't really changed and it stays at 8M. This is again
 different from x86_64.

Orabug: 25869946

Reviewed-by: default avatarBob Picco <>
Signed-off-by: default avatarNitin Gupta <>
Signed-off-by: default avatarDavid S. Miller <>
parent fc290a11
......@@ -325,6 +325,29 @@ static void __update_mmu_tsb_insert(struct mm_struct *mm, unsigned long tsb_inde
static void __init add_huge_page_size(unsigned long size)
unsigned int order;
if (size_to_hstate(size))
order = ilog2(size) - PAGE_SHIFT;
static int __init hugetlbpage_init(void)
add_huge_page_size(1UL << HPAGE_64K_SHIFT);
add_huge_page_size(1UL << HPAGE_SHIFT);
add_huge_page_size(1UL << HPAGE_256MB_SHIFT);
add_huge_page_size(1UL << HPAGE_2GB_SHIFT);
return 0;
static int __init setup_hugepagesz(char *string)
unsigned long long hugepage_size;
......@@ -364,7 +387,7 @@ static int __init setup_hugepagesz(char *string)
goto out;
hugetlb_add_hstate(hugepage_shift - PAGE_SHIFT);
rc = 1;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment