On Thu, Aug 29, 2024 at 09:48:44AM +0100, Lorenzo Stoakes wrote:
On Thu, Aug 29, 2024 at 12:15:59AM GMT, Charlie Jenkins wrote:
[snip]
diff --git a/mm/mmap.c b/mm/mmap.c index d0dfc85b209b..34ba0db23678 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1796,6 +1796,9 @@ generic_get_unmapped_area(struct file *filp, unsigned long addr, struct vm_unmapped_area_info info = {}; const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags);
- info.hint = addr;
- info.mmap_flags = flags;
- if (len > mmap_end - mmap_min_addr) return -ENOMEM;
@@ -1841,6 +1844,9 @@ generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr, struct vm_unmapped_area_info info = {}; const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags);
- info.hint = addr;
- info.mmap_flags = flags;
- /* requested length too big for entire address space */ if (len > mmap_end - mmap_min_addr) return -ENOMEM;
These line numbers suggest you're working against Linus's tree, mm/mmap.c has changed a lot recently, so to avoid conflicts please base your changes on mm-unstable in Andrew's tree (if looking to go through that) or at least -next.
I will make sure that I base off of mm-unstable for future revisions.
- Charlie
-- 2.45.0