projects
/
users
/
jedix
/
linux-maple.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
90c3277
)
mmap: mmap_region() whitespace fix
author
Liam R. Howlett <Liam.Howlett@Oracle.com>
Wed, 25 Nov 2020 01:23:17 +0000
(20:23 -0500)
committer
Liam R. Howlett <Liam.Howlett@Oracle.com>
Tue, 5 Jan 2021 17:33:27 +0000
(12:33 -0500)
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
mm/mmap.c
patch
|
blob
|
history
diff --git
a/mm/mmap.c
b/mm/mmap.c
index ee04a533bb918f8cd110509e6f266a668e9ce88c..e20403ad4aed8e58565def2fdd7dabade9fa7349 100644
(file)
--- a/
mm/mmap.c
+++ b/
mm/mmap.c
@@
-2618,7
+2618,7
@@
unsigned long mmap_region(struct file *file, unsigned long addr,
/* Check next */
next = mas_next(&mas, ULONG_MAX);
if (next && next->vm_start == end && vma_policy(next) &&
- can_vma_merge_before(next, vm_flags, NULL, file, pgoff
+
pglen,
+ can_vma_merge_before(next, vm_flags, NULL, file, pgoff
+
pglen,
NULL_VM_UFFD_CTX)) {
merge_end = next->vm_end;
vma = next;