diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-15 17:57:43 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-15 17:57:43 +1100 |
| commit | 1db4de84707d2123c29db78959bab22055c463ed (patch) | |
| tree | 182094b0603edd3511fd5b1322af49f5e0d2e7c2 /mm/internal.h | |
| parent | 2f15ab949e41ba7e85fe811642fd6cdf9d0b944d (diff) | |
| parent | 1217d2bf967ae6dc45c2a33bf3ebf0482310548d (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'mm/internal.h')
| -rw-r--r-- | mm/internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/internal.h b/mm/internal.h index 9ba21100ebf3..1c0c4cc0fcf7 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -162,8 +162,8 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, struct rb_node *rb_parent); #ifdef CONFIG_MMU -extern long mlock_vma_pages_range(struct vm_area_struct *vma, - unsigned long start, unsigned long end); +extern long __mlock_vma_pages_range(struct vm_area_struct *vma, + unsigned long start, unsigned long end, int *nonblocking); extern void munlock_vma_pages_range(struct vm_area_struct *vma, unsigned long start, unsigned long end); static inline void munlock_vma_pages_all(struct vm_area_struct *vma) |