[PATCH OLK-6.6] mm/dynamic_pool: use __GENKSYMS__ to revert the kabi change

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAO6NS -------------------------------- Revert the kabi change introduced by including <linux/dynamic_pool.h> for kabi trustlist standardization. Fixes: 3b6fa5506d80 ("mm: limit order to 0 when allocated from dynamic pool") Signed-off-by: Liu Shixin <liushixin2@huawei.com> --- mm/filemap.c | 2 ++ mm/readahead.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mm/filemap.c b/mm/filemap.c index edc223834cde..77a8947b8e5e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -47,7 +47,9 @@ #include <linux/splice.h> #include <linux/huge_mm.h> #include <linux/pgtable.h> +#ifndef __GENKSYMS__ #include <linux/dynamic_pool.h> +#endif #include <asm/pgalloc.h> #include <asm/tlbflush.h> #include "internal.h" diff --git a/mm/readahead.c b/mm/readahead.c index 2486c625e724..438f142a3e74 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -128,7 +128,9 @@ #include <linux/blk-cgroup.h> #include <linux/fadvise.h> #include <linux/sched/mm.h> +#ifndef __GENKSYMS__ #include <linux/dynamic_pool.h> +#endif #include "internal.h" -- 2.34.1

反馈: 您发送到kernel@openeuler.org的补丁/补丁集,已成功转换为PR! PR链接地址: https://gitee.com/openeuler/kernel/pulls/14183 邮件列表地址:https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/B... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/14183 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/B...
participants (2)
-
Liu Shixin
-
patchwork bot