提交 d877da6b 编写于 作者: L Liu Shixin

mm/dynamic_hugetlb: fix kabi broken when enable CONFIG_DYNAMIC_HUGETLB on arm64

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6XOIE
CVE: NA

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

When enable dynamic hugetlb on arm64, the new member struct dhugetlb_pool*
will be added to mem_cgroup. We need to use a KABI_RESERVE to fix broken
of kabi. The previous struct dhugetlb_pool* is only used on x86_64.
Signed-off-by: NLiu Shixin <liushixin2@huawei.com>
上级 ea95ab8c
...@@ -372,7 +372,7 @@ struct mem_cgroup { ...@@ -372,7 +372,7 @@ struct mem_cgroup {
struct deferred_split deferred_split_queue; struct deferred_split deferred_split_queue;
#endif #endif
#ifdef CONFIG_DYNAMIC_HUGETLB #if defined(CONFIG_DYNAMIC_HUGETLB) && defined(CONFIG_X86_64)
struct dhugetlb_pool *hpool; struct dhugetlb_pool *hpool;
#endif #endif
#ifndef __GENKSYMS__ #ifndef __GENKSYMS__
...@@ -392,7 +392,11 @@ struct mem_cgroup { ...@@ -392,7 +392,11 @@ struct mem_cgroup {
KABI_RESERVE(3) KABI_RESERVE(3)
KABI_RESERVE(4) KABI_RESERVE(4)
#endif #endif
#if defined(CONFIG_DYNAMIC_HUGETLB) && defined(CONFIG_ARM64)
KABI_USE(5, struct dhugetlb_pool *hpool)
#else
KABI_RESERVE(5) KABI_RESERVE(5)
#endif
KABI_RESERVE(6) KABI_RESERVE(6)
KABI_RESERVE(7) KABI_RESERVE(7)
KABI_RESERVE(8) KABI_RESERVE(8)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册