projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r8169: read MAC address from EEPROM on init (2nd attempt)
[cascardo/linux.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index
2f55a1e
..
23acefe
100644
(file)
--- 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,
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;
if (error)
goto out;
@@
-1374,7
+1374,7
@@
do_readahead(struct address_space *mapping, struct file *filp,
return 0;
}
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;
{
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;
}
}
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
/**
#ifdef CONFIG_MMU
/**