Skip to content

Commit b8748ee

Browse files
committed
deepin: mm/memory: Fix kabi breakage for zap_vma_ptes by moving include
deepin inclusion category: kabi No functional change, just move the headers which cause kabi break in CONFIG_DEEPIN_KABI_RESERVE=y. Log: cat Module.symvers | grep zap_vma_ptes before fix: 0x7d0ccd7f zap_vma_ptes vmlinux EXPORT_SYMBOL_GPL after fix: 0x4bf1f352 zap_vma_ptes vmlinux EXPORT_SYMBOL_GPL Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 85d1c1a commit b8748ee

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

mm/memory.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@
6767
#include <linux/gfp.h>
6868
#include <linux/migrate.h>
6969
#include <linux/string.h>
70+
#ifndef CONFIG_DEEPIN_KABI_RESERVE
7071
#include <linux/shmem_fs.h>
72+
#endif
7173
#include <linux/memory-tiers.h>
7274
#include <linux/debugfs.h>
7375
#include <linux/userfaultfd_k.h>
@@ -4478,6 +4480,9 @@ static bool vmf_pte_changed(struct vm_fault *vmf)
44784480
*
44794481
* Return: %0 on success, %VM_FAULT_ code in case of error.
44804482
*/
4483+
#ifdef CONFIG_DEEPIN_KABI_RESERVE
4484+
#include <linux/shmem_fs.h>
4485+
#endif
44814486
vm_fault_t finish_fault(struct vm_fault *vmf)
44824487
{
44834488
struct vm_area_struct *vma = vmf->vma;

0 commit comments

Comments
 (0)