diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory.c | 11 | ||||
-rw-r--r-- | mm/nommu.c | 7 |
2 files changed, 6 insertions, 12 deletions
diff --git a/mm/memory.c b/mm/memory.c index 79ebed3a4c2b..bac2d994850e 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -3935,19 +3935,14 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, | |||
3935 | * @addr: start address to access | 3935 | * @addr: start address to access |
3936 | * @buf: source or destination buffer | 3936 | * @buf: source or destination buffer |
3937 | * @len: number of bytes to transfer | 3937 | * @len: number of bytes to transfer |
3938 | * @write: whether the access is a write | 3938 | * @gup_flags: flags modifying lookup behaviour |
3939 | * | 3939 | * |
3940 | * The caller must hold a reference on @mm. | 3940 | * The caller must hold a reference on @mm. |
3941 | */ | 3941 | */ |
3942 | int access_remote_vm(struct mm_struct *mm, unsigned long addr, | 3942 | int access_remote_vm(struct mm_struct *mm, unsigned long addr, |
3943 | void *buf, int len, int write) | 3943 | void *buf, int len, unsigned int gup_flags) |
3944 | { | 3944 | { |
3945 | unsigned int flags = FOLL_FORCE; | 3945 | return __access_remote_vm(NULL, mm, addr, buf, len, gup_flags); |
3946 | |||
3947 | if (write) | ||
3948 | flags |= FOLL_WRITE; | ||
3949 | |||
3950 | return __access_remote_vm(NULL, mm, addr, buf, len, flags); | ||
3951 | } | 3946 | } |
3952 | 3947 | ||
3953 | /* | 3948 | /* |
diff --git a/mm/nommu.c b/mm/nommu.c index bde7df35118b..93d5bb53fc63 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -1847,15 +1847,14 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, | |||
1847 | * @addr: start address to access | 1847 | * @addr: start address to access |
1848 | * @buf: source or destination buffer | 1848 | * @buf: source or destination buffer |
1849 | * @len: number of bytes to transfer | 1849 | * @len: number of bytes to transfer |
1850 | * @write: whether the access is a write | 1850 | * @gup_flags: flags modifying lookup behaviour |
1851 | * | 1851 | * |
1852 | * The caller must hold a reference on @mm. | 1852 | * The caller must hold a reference on @mm. |
1853 | */ | 1853 | */ |
1854 | int access_remote_vm(struct mm_struct *mm, unsigned long addr, | 1854 | int access_remote_vm(struct mm_struct *mm, unsigned long addr, |
1855 | void *buf, int len, int write) | 1855 | void *buf, int len, unsigned int gup_flags) |
1856 | { | 1856 | { |
1857 | return __access_remote_vm(NULL, mm, addr, buf, len, | 1857 | return __access_remote_vm(NULL, mm, addr, buf, len, gup_flags); |
1858 | write ? FOLL_WRITE : 0); | ||
1859 | } | 1858 | } |
1860 | 1859 | ||
1861 | /* | 1860 | /* |