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
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[safe/jmp/linux-2.6]
/
mm
/
fremap.c
diff --git
a/mm/fremap.c
b/mm/fremap.c
index
b6ec85a
..
46f5dac
100644
(file)
--- a/
mm/fremap.c
+++ b/
mm/fremap.c
@@
-40,7
+40,7
@@
static void zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
page_remove_rmap(page);
page_cache_release(page);
update_hiwater_rss(mm);
- dec_mm_counter(mm,
file_rss
);
+ dec_mm_counter(mm,
MM_FILEPAGES
);
}
} else {
if (!pte_file(pte))