AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 04:30:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm: hugetlb: fix the name of hugetlb CMA

Browse Source 
Once we enable CMA_DEBUGFS, we will get the below errors: directory
'cma-hugetlb' with parent 'cma' already present.

We should have different names for different CMA areas.

Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Acked-by: Roman Gushchin <guro@fb.com>
Link: http://lkml.kernel.org/r/20200616223131.33828-3-song.bao.hua@hisilicon.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Barry Song 2020-08-11 18:32:00 -07:00 committed by Linus Torvalds
parent 18e98e56f4
commit 29d0f41d23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mm/hugetlb.c
View File

@ -5707,12 +5707,14 @@ void __init hugetlb_cma_reserve(int order)
reserved = 0; reserved = 0;
for_each_node_state(nid, N_ONLINE) { for_each_node_state(nid, N_ONLINE) {
int res; int res;
char name[20];
size = min(per_node, hugetlb_cma_size - reserved); size = min(per_node, hugetlb_cma_size - reserved);
size = round_up(size, PAGE_SIZE << order); size = round_up(size, PAGE_SIZE << order);
snprintf(name, 20, "hugetlb%d", nid);
res = cma_declare_contiguous_nid(0, size, 0, PAGE_SIZE << order, res = cma_declare_contiguous_nid(0, size, 0, PAGE_SIZE << order,
0, false, "hugetlb", 0, false, name,
&hugetlb_cma[nid], nid); &hugetlb_cma[nid], nid);
if (res) { if (res) {
pr_warn("hugetlb_cma: reservation failed: err %d, node %d", pr_warn("hugetlb_cma: reservation failed: err %d, node %d",