X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=mm%2Ffilemap.c;h=23acefe51808fdf0b8ed7ec3a7a5c92ee424cad1;hb=5e3bd4e4b1082e406351083784e3de4cdaa50d7a;hp=2f55a1e2baf75db8ea692a7e093aaded51147369;hpb=5fec8bdbf9a1c4df4ad3f20e52aa2d8caed490c8;p=cascardo%2Flinux.git diff --git a/mm/filemap.c b/mm/filemap.c index 2f55a1e2baf7..23acefe51808 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -460,7 +460,7 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, VM_BUG_ON(!PageLocked(page)); error = mem_cgroup_cache_charge(page, current->mm, - gfp_mask & ~__GFP_HIGHMEM); + gfp_mask & GFP_RECLAIM_MASK); if (error) goto out; @@ -1374,7 +1374,7 @@ do_readahead(struct address_space *mapping, struct file *filp, return 0; } -asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count) +SYSCALL_DEFINE(readahead)(int fd, loff_t offset, size_t count) { ssize_t ret; struct file *file; @@ -1393,6 +1393,13 @@ asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count) } return ret; } +#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS +asmlinkage long SyS_readahead(long fd, loff_t offset, long count) +{ + return SYSC_readahead((int) fd, offset, (size_t) count); +} +SYSCALL_ALIAS(sys_readahead, SyS_readahead); +#endif #ifdef CONFIG_MMU /**