提交 d47ef9cf 编写于 作者: F Fang Lijun 提交者: Yang Yingliang

x86/mm/ioremap: Fix HUGE_VMAP interface redefinition

ascend inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4EUVI
CVE: NA

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

arch_vmap_p4d_supported arch_vmap_pud_supported arch_vmap_pmd_supported
redefined when disable CONFIG_HAVE_ARCH_HUGE_VMAP on x86.

Fixes: 396a313c1a6a ("mm: HUGE_VMAP arch support cleanup")
Signed-off-by: NFang Lijun <fanglijun3@huawei.com>
Reviewed-by: NDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 f6f0523a
...@@ -431,6 +431,7 @@ void iounmap(volatile void __iomem *addr) ...@@ -431,6 +431,7 @@ void iounmap(volatile void __iomem *addr)
} }
EXPORT_SYMBOL(iounmap); EXPORT_SYMBOL(iounmap);
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
bool arch_vmap_p4d_supported(pgprot_t prot) bool arch_vmap_p4d_supported(pgprot_t prot)
{ {
return false; return false;
...@@ -449,6 +450,7 @@ bool arch_vmap_pmd_supported(pgprot_t prot) ...@@ -449,6 +450,7 @@ bool arch_vmap_pmd_supported(pgprot_t prot)
{ {
return boot_cpu_has(X86_FEATURE_PSE); return boot_cpu_has(X86_FEATURE_PSE);
} }
#endif
/* /*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem * Convert a physical pointer to a virtual kernel pointer for /dev/mem
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册