2 files changed, 5 insertions, 3 deletions

diff --git a/mm/memory.c b/mm/memory.c
index baa999e87cd2..2032ad2fc34b 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1665,9 +1665,10 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
          * behaviour that some programs depend on. We mark the "original"
          * un-COW'ed pages by matching them up with "vma->vm_pgoff".
          */
-        if (addr == vma->vm_start && end == vma->vm_end)
+        if (addr == vma->vm_start && end == vma->vm_end) {
                 vma->vm_pgoff = pfn;
-        else if (is_cow_mapping(vma->vm_flags))
+                vma->vm_flags |= VM_PFN_AT_MMAP;
+        } else if (is_cow_mapping(vma->vm_flags))
                 return -EINVAL;
 
         vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
@@ -1679,6 +1680,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
                  * needed from higher level routine calling unmap_vmas
                  */
                 vma->vm_flags &= ~(VM_IO | VM_RESERVED | VM_PFNMAP);
+                vma->vm_flags &= ~VM_PFN_AT_MMAP;
                 return -EINVAL;
         }
 
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 6177e3bcd66b..e89517141657 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1469,7 +1469,7 @@ static void shrink_zone(int priority, struct zone *zone,
                 int file = is_file_lru(l);
                 int scan;
 
-                scan = zone_page_state(zone, NR_LRU_BASE + l);
+                scan = zone_nr_pages(zone, sc, l);
                 if (priority) {
                         scan >>= priority;
                         scan = (scan * percent[file]) / 100;