projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86/smpboot: Init apic mapping before usage
[cascardo/linux.git]
/
mm
/
frame_vector.c
diff --git
a/mm/frame_vector.c
b/mm/frame_vector.c
index
381bb07
..
db77dcb
100644
(file)
--- a/
mm/frame_vector.c
+++ b/
mm/frame_vector.c
@@
-11,10
+11,7
@@
* get_vaddr_frames() - map virtual addresses to pfns
* @start: starting user address
* @nr_frames: number of pages / pfns from start to map
* get_vaddr_frames() - map virtual addresses to pfns
* @start: starting user address
* @nr_frames: number of pages / pfns from start to map
- * @write: whether pages will be written to by the caller
- * @force: whether to force write access even if user mapping is
- * readonly. See description of the same argument of
- get_user_pages().
+ * @gup_flags: flags modifying lookup behaviour
* @vec: structure which receives pages / pfns of the addresses mapped.
* It should have space for at least nr_frames entries.
*
* @vec: structure which receives pages / pfns of the addresses mapped.
* It should have space for at least nr_frames entries.
*
@@
-34,7
+31,7
@@
* This function takes care of grabbing mmap_sem as necessary.
*/
int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
* This function takes care of grabbing mmap_sem as necessary.
*/
int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
-
bool write, bool force
, struct frame_vector *vec)
+
unsigned int gup_flags
, struct frame_vector *vec)
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
@@
-59,7
+56,7
@@
int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
vec->got_ref = true;
vec->is_pfns = false;
ret = get_user_pages_locked(start, nr_frames,
vec->got_ref = true;
vec->is_pfns = false;
ret = get_user_pages_locked(start, nr_frames,
-
write, force
, (struct page **)(vec->ptrs), &locked);
+
gup_flags
, (struct page **)(vec->ptrs), &locked);
goto out;
}
goto out;
}