Merge tag 'v3.10.65' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 7905fe721aa8ab3db06c957c9f2cc63cea1fee5f..c622424ff4d7f7102894d079fedc4483ec79951a 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1634,6 +1634,10 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
        } else if (!page) {
                /* No page in the page cache at all */
                do_sync_mmap_readahead(vma, ra, file, offset);
+#ifdef CONFIG_ZRAM
+        current->fm_flt++;
+#endif
+               count_vm_event(PGFMFAULT);
                count_vm_event(PGMAJFAULT);
                mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT);
                ret = VM_FAULT_MAJOR;