aboutsummaryrefslogtreecommitdiffstats
path: root/mm/internal.h
diff options
context:
space:
mode:
authorHugh Dickins <hugh.dickins@tiscali.co.uk>2009-09-21 20:03:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 10:17:40 -0400
commit58fa879e1e640a1856f736b418984ebeccee1c95 (patch)
treedc37bce8379e29c46e79f105cc71d137b14965cf /mm/internal.h
parenta13ea5b759645a0779edc6dbfec9abfd83220844 (diff)
mm: FOLL flags for GUP flags
__get_user_pages() has been taking its own GUP flags, then processing them into FOLL flags for follow_page(). Though oddly named, the FOLL flags are more widely used, so pass them to __get_user_pages() now. Sorry, VM flags, VM_FAULT flags and FAULT_FLAGs are still distinct. (The patch to __get_user_pages() looks peculiar, with both gup_flags and foll_flags: the gup_flags remain constant; but as before there's an exceptional case, out of scope of the patch, in which foll_flags per page have FOLL_WRITE masked off.) Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk> Cc: Rik van Riel <riel@redhat.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Minchan Kim <minchan.kim@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/internal.h')
-rw-r--r--mm/internal.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/internal.h b/mm/internal.h
index d41475078b20..75596574911e 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -250,12 +250,8 @@ static inline void mminit_validate_memmodel_limits(unsigned long *start_pfn,
250} 250}
251#endif /* CONFIG_SPARSEMEM */ 251#endif /* CONFIG_SPARSEMEM */
252 252
253#define GUP_FLAGS_WRITE 0x01
254#define GUP_FLAGS_FORCE 0x02
255#define GUP_FLAGS_DUMP 0x04
256
257int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, 253int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
258 unsigned long start, int len, int flags, 254 unsigned long start, int len, unsigned int foll_flags,
259 struct page **pages, struct vm_area_struct **vmas); 255 struct page **pages, struct vm_area_struct **vmas);
260 256
261#define ZONE_RECLAIM_NOSCAN -2 257#define ZONE_RECLAIM_NOSCAN -2