diff options
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 335288bff1b7..72a15dc26bbf 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -73,7 +73,7 @@ extern unsigned int kobjsize(const void *objp); | |||
| 73 | #endif | 73 | #endif |
| 74 | 74 | ||
| 75 | /* | 75 | /* |
| 76 | * vm_flags.. | 76 | * vm_flags in vm_area_struct, see mm_types.h. |
| 77 | */ | 77 | */ |
| 78 | #define VM_READ 0x00000001 /* currently active flags */ | 78 | #define VM_READ 0x00000001 /* currently active flags */ |
| 79 | #define VM_WRITE 0x00000002 | 79 | #define VM_WRITE 0x00000002 |
| @@ -834,7 +834,6 @@ extern int mprotect_fixup(struct vm_area_struct *vma, | |||
| 834 | struct vm_area_struct **pprev, unsigned long start, | 834 | struct vm_area_struct **pprev, unsigned long start, |
| 835 | unsigned long end, unsigned long newflags); | 835 | unsigned long end, unsigned long newflags); |
| 836 | 836 | ||
| 837 | #ifdef CONFIG_HAVE_GET_USER_PAGES_FAST | ||
| 838 | /* | 837 | /* |
| 839 | * get_user_pages_fast provides equivalent functionality to get_user_pages, | 838 | * get_user_pages_fast provides equivalent functionality to get_user_pages, |
| 840 | * operating on current and current->mm (force=0 and doesn't return any vmas). | 839 | * operating on current and current->mm (force=0 and doesn't return any vmas). |
| @@ -848,25 +847,6 @@ extern int mprotect_fixup(struct vm_area_struct *vma, | |||
| 848 | int get_user_pages_fast(unsigned long start, int nr_pages, int write, | 847 | int get_user_pages_fast(unsigned long start, int nr_pages, int write, |
| 849 | struct page **pages); | 848 | struct page **pages); |
| 850 | 849 | ||
| 851 | #else | ||
| 852 | /* | ||
| 853 | * Should probably be moved to asm-generic, and architectures can include it if | ||
| 854 | * they don't implement their own get_user_pages_fast. | ||
| 855 | */ | ||
| 856 | #define get_user_pages_fast(start, nr_pages, write, pages) \ | ||
| 857 | ({ \ | ||
| 858 | struct mm_struct *mm = current->mm; \ | ||
| 859 | int ret; \ | ||
| 860 | \ | ||
| 861 | down_read(&mm->mmap_sem); \ | ||
| 862 | ret = get_user_pages(current, mm, start, nr_pages, \ | ||
| 863 | write, 0, pages, NULL); \ | ||
| 864 | up_read(&mm->mmap_sem); \ | ||
| 865 | \ | ||
| 866 | ret; \ | ||
| 867 | }) | ||
| 868 | #endif | ||
| 869 | |||
| 870 | /* | 850 | /* |
| 871 | * A callback you can register to apply pressure to ageable caches. | 851 | * A callback you can register to apply pressure to ageable caches. |
| 872 | * | 852 | * |
