serial: PL011: clear pending interrupts

[linux-flexiantxendom0.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 1b1ca17..15dec6a 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3211,10 +3211,15 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
        else
                VM_BUG_ON(!PageLocked(vmf.page));
 
+       page = vmf.page;
+
+       /* Mark the page as used on fault. */
+       if (PageReadaheadUnused(page))
+               ClearPageReadaheadUnused(page);
+
        /*
         * Should we do an early C-O-W break?
         */
-       page = vmf.page;
        if (flags & FAULT_FLAG_WRITE) {
                if (!(vma->vm_flags & VM_SHARED)) {
                        page = cow_page;