diff options
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 11 | 
1 files changed, 1 insertions, 10 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e5318c7793a..4f3ea0b1e57 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1906,14 +1906,12 @@ static int __init hugetlb_init(void)  		default_hstate.max_huge_pages = default_hstate_max_huge_pages;  	hugetlb_init_hstates(); -  	gather_bootmem_prealloc(); -  	report_hugepages();  	hugetlb_sysfs_init(); -  	hugetlb_register_all_nodes(); +	hugetlb_cgroup_file_init();  	return 0;  } @@ -1943,13 +1941,6 @@ void __init hugetlb_add_hstate(unsigned order)  	h->next_nid_to_free = first_node(node_states[N_MEMORY]);  	snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB",  					huge_page_size(h)/1024); -	/* -	 * Add cgroup control files only if the huge page consists -	 * of more than two normal pages. This is because we use -	 * page[2].lru.next for storing cgoup details. -	 */ -	if (order >= HUGETLB_CGROUP_MIN_ORDER) -		hugetlb_cgroup_file_init(hugetlb_max_hstate - 1);  	parsed_hstate = h;  }  |