Skip to contentSkip to conversation

include/linux/mm: declare different type of split_vma() for !CONFIG_MMU

PATCH New SeongJae Park 1 participant 1 message Jan 6, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 include/linux/mm: declare different type of split_vma() for !CONFIG_MMU

Commit 95000286ff79 ("mm: switch vma_merge(), split_vma(), and __split_vma to vma iterator") on mm-unstable didn't make the change to nommu.c, but the declaration change was applied to !CONFIG_MMU, too. It causes below build failure.

linux/mm/nommu.c:1347:5: error: conflicting types for 'split_vma'
1347 | int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
| ^~~~~~~~~
In file included from linux/mm/nommu.c:20:
linux/include/linux/mm.h:2846:12: note: previous declaration of 'split_vma' was here
2846 | extern int split_vma(struct vma_iterator *vmi, struct vm_area_struct *,
| ^~~~~~~~~

Fix the build failure by adding the split_vma() declaration for !CONFIG_MMU case.

Fixes 95000286ff79 ("mm: switch vma_merge(), split_vma(), and __split_vma to vma iterator") on mm-unstabl
---
 include/linux/mm.h | 5 +++++
 1 file changed, 5 insertions(+)
include/linux/mm.h +5 -0
index 4d9148b939f8..a2bf261cdbef 100644
@@ -2843,8 +2843,13 @@ extern struct vm_area_struct *vma_merge(struct vma_iterator *vmi,
 extern struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *);
 extern int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *,
 		       unsigned long addr, int new_below);
+#ifdef CONFIG_MMU
 extern int split_vma(struct vma_iterator *vmi, struct vm_area_struct *,
 			 unsigned long addr, int new_below);
+#else
+extern int split_vma(struct mm_struct *, struct vm_area_struct *,
+			 unsigned long addr, int new_below);
+#endif	/* CONFIG_MMU */
 extern int insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
 extern void unlink_file_vma(struct vm_area_struct *);
 extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
Signature · 1 line
2.25.1