[PATCH v2 3/3] mm/memory: merge __vm_insert_mixed() into vmf_insert_mixed()
From: Sang-Heon Jeon
Date: Fri Oct 02 2026 - 12:07:28 EST
vmf_insert_mixed() just calls __vm_insert_mixed() with the same
arguments.
So merge __vm_insert_mixed() into vmf_insert_mixed().
No functional change.
Signed-off-by: Sang-Heon Jeon <ekffu200098@xxxxxxxxx>
---
mm/memory.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index 6c1d38eba7b2..bde650e207c9 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2991,8 +2991,8 @@ static bool vm_mixed_ok(struct vm_area_struct *vma, unsigned long pfn)
return false;
}
-static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma,
- unsigned long addr, unsigned long pfn)
+vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
+ unsigned long pfn)
{
pgprot_t pgprot = vma->vm_page_prot;
int err;
@@ -3041,6 +3041,7 @@ static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma,
return VM_FAULT_NOPAGE;
}
+EXPORT_SYMBOL(vmf_insert_mixed);
vm_fault_t vmf_insert_page_mkwrite(struct vm_fault *vmf, struct page *page,
bool write)
@@ -3062,13 +3063,6 @@ vm_fault_t vmf_insert_page_mkwrite(struct vm_fault *vmf, struct page *page,
}
EXPORT_SYMBOL_GPL(vmf_insert_page_mkwrite);
-vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
- unsigned long pfn)
-{
- return __vm_insert_mixed(vma, addr, pfn);
-}
-EXPORT_SYMBOL(vmf_insert_mixed);
-
/*
* maps a range of physical memory into the requested pages. the old
* mappings are removed. any references to nonexistent pages results
--
2.43.0