[PATCH v4 2/6] mmap: make mlock_future_check() global
STALE2216d
From: Mike Rapoport <rppt@kernel.org>
Date: 2020-08-18 14:16:46
Also in:
linux-api, linux-arm-kernel, linux-fsdevel, linux-mm, linux-riscv, lkml, nvdimm
Subsystem:
memory management, memory management - core, memory mapping, the rest · Maintainers:
Andrew Morton, David Hildenbrand, Liam R. Howlett, Lorenzo Stoakes, Linus Torvalds
Revision v4 of 19 in this series.
Revisions (19)
- v2 [diff vs current]
- v3 [diff vs current]
- v4 current
- v5 [diff vs current]
- v6 [diff vs current]
- v7 [diff vs current]
- v8 [diff vs current]
- v9 [diff vs current]
- v10 [diff vs current]
- v11 [diff vs current]
- v12 [diff vs current]
- v13 [diff vs current]
- v14 [diff vs current]
- v15 [diff vs current]
- v16 [diff vs current]
- v17 [diff vs current]
- v18 [diff vs current]
- v19 [diff vs current]
- v20 [diff vs current]
From: Mike Rapoport <redacted> It will be used by the upcoming secret memory implementation. Signed-off-by: Mike Rapoport <redacted> --- mm/internal.h | 3 +++ mm/mmap.c | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/mm/internal.h b/mm/internal.h
index 10c677655912..40544fbf49c9 100644
--- a/mm/internal.h
+++ b/mm/internal.h@@ -350,6 +350,9 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma) extern void mlock_vma_page(struct page *page); extern unsigned int munlock_vma_page(struct page *page); +extern int mlock_future_check(struct mm_struct *mm, unsigned long flags, + unsigned long len); + /* * Clear the page's PageMlocked(). This can be useful in a situation where * we want to unconditionally remove a page from the pagecache -- e.g.,
diff --git a/mm/mmap.c b/mm/mmap.c
index 40248d84ad5f..190761920142 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c@@ -1310,9 +1310,8 @@ static inline unsigned long round_hint_to_min(unsigned long hint) return hint; } -static inline int mlock_future_check(struct mm_struct *mm, - unsigned long flags, - unsigned long len) +int mlock_future_check(struct mm_struct *mm, unsigned long flags, + unsigned long len) { unsigned long locked, lock_limit;
--
2.26.2