提交 dccc202f 编写于 作者: W Weilong Chen 提交者: Yang Yingliang

hugetlbfs: Add dependency with ascend memory features

ascend inclusion
category: feature
bugzilla: NA
CVE: NA

-------------------------------------------------

The ascend memory feature depends on the large page feature,
but it is not associated. When CONFIG_HUGETLBFS is turned off,
the compilation will fail.

This patch add dependencies in configs.
Acked-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NWeilong Chen <chenweilong@huawei.com>
Reviewed-by: NDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NCheng Jian <cj.chengjian@huawei.com>
上级 09010f4e
...@@ -1361,6 +1361,7 @@ config ASCEND_IOPF_HIPRI ...@@ -1361,6 +1361,7 @@ config ASCEND_IOPF_HIPRI
config ASCEND_CHARGE_MIGRATE_HUGEPAGES config ASCEND_CHARGE_MIGRATE_HUGEPAGES
bool "Enable support for migrate hugepages" bool "Enable support for migrate hugepages"
depends on HUGETLBFS
default y default y
help help
When reseved hugepages are used up, we attempts to apply for migrate When reseved hugepages are used up, we attempts to apply for migrate
...@@ -1382,6 +1383,7 @@ config ASCEND_WATCHDOG_SYSFS_CONFIGURE ...@@ -1382,6 +1383,7 @@ config ASCEND_WATCHDOG_SYSFS_CONFIGURE
config ASCEND_AUTO_TUNING_HUGEPAGE config ASCEND_AUTO_TUNING_HUGEPAGE
bool "Enable support for the auto-tuning hugepage" bool "Enable support for the auto-tuning hugepage"
depends on HUGETLBFS
default y default y
help help
The hugepage auto-tuning means the kernel dynamically manages the number of The hugepage auto-tuning means the kernel dynamically manages the number of
......
...@@ -554,7 +554,7 @@ config ADI ...@@ -554,7 +554,7 @@ config ADI
config HISI_SVM config HISI_SVM
bool "Hisilicon svm driver" bool "Hisilicon svm driver"
depends on ARM64 && ARM_SMMU_V3 && MMU_NOTIFIER depends on ARM64 && ARM_SMMU_V3 && MMU_NOTIFIER && HUGETLBFS
default y default y
help help
This driver provides character-level access to Hisilicon This driver provides character-level access to Hisilicon
......
...@@ -629,6 +629,13 @@ static inline void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr ...@@ -629,6 +629,13 @@ static inline void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr
pte_t *ptep, pte_t pte, unsigned long sz) pte_t *ptep, pte_t pte, unsigned long sz)
{ {
} }
static inline int hugetlb_insert_hugepage_pte_by_pa(struct mm_struct *mm,
unsigned long vir_addr,
pgprot_t prot, unsigned long phy_addr)
{
return 0;
}
#endif /* CONFIG_HUGETLB_PAGE */ #endif /* CONFIG_HUGETLB_PAGE */
static inline spinlock_t *huge_pte_lock(struct hstate *h, static inline spinlock_t *huge_pte_lock(struct hstate *h,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册