git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
memcg: show memcg information during OOM
[safe/jmp/linux-2.6]
/
mm
/
mincore.c
diff --git
a/mm/mincore.c
b/mm/mincore.c
index
5efe0de
..
8cb508f
100644
(file)
--- a/
mm/mincore.c
+++ b/
mm/mincore.c
@@
-33,7
+33,7
@@
static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff)
* When tmpfs swaps out a page from a file, any process mapping that
* file will not get a swp_entry_t in its pte, but rather it is like
* any other file mapping (ie. marked !present and faulted in with
* When tmpfs swaps out a page from a file, any process mapping that
* file will not get a swp_entry_t in its pte, but rather it is like
* any other file mapping (ie. marked !present and faulted in with
- * tmpfs's .
nopage
). So swapped out tmpfs mappings are tested here.
+ * tmpfs's .
fault
). So swapped out tmpfs mappings are tested here.
*
* However when tmpfs moves the page from pagecache and into swapcache,
* it is still in core, but the find_get_page below won't find it.
*
* However when tmpfs moves the page from pagecache and into swapcache,
* it is still in core, but the find_get_page below won't find it.
@@
-177,8
+177,8
@@
none_mapped:
* mapped
* -EAGAIN - A kernel resource was temporarily unavailable.
*/
* mapped
* -EAGAIN - A kernel resource was temporarily unavailable.
*/
-
asmlinkage long sys_mincore(unsigned long start, size_t
len,
-
unsigned char __user *
vec)
+
SYSCALL_DEFINE3(mincore, unsigned long, start, size_t,
len,
+
unsigned char __user *,
vec)
{
long retval;
unsigned long pages;
{
long retval;
unsigned long pages;