lkml.org 
[lkml]   [2023]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH mm-unstable 1/1] include/linux/mm: declare different type of split_vma() for !CONFIG_MMU
Date
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
Signed-off-by: SeongJae Park <sj@kernel.org>
---
include/linux/mm.h | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4d9148b939f8..a2bf261cdbef 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -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 **,
--
2.25.1
\
 
 \ /
  Last update: 2023-03-26 23:31    [W:0.030 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site