From bfdf7a755962e10e369ff9929a316b6b1370106c Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Sun, 29 Jul 2012 20:22:49 +0200
Subject: [PATCH] --- yaml --- r: 320481 b: refs/heads/master c:
 194f8dcbe9629d8e9346cf96345a9c0bbf0e67ae h: refs/heads/master i:   320479:
 759b15dabd5f6e4d3ba69a234473bc66ea6ed404 v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/events/uprobes.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ac8993829c1e..9e51bc4528ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57683f72b8c01c53c85fe13e82fe1feb3a06bcd5
+refs/heads/master: 194f8dcbe9629d8e9346cf96345a9c0bbf0e67ae
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index bb30a4fc5050..c08a22d02f72 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -32,6 +32,7 @@
 #include <linux/swap.h>		/* try_to_free_swap */
 #include <linux/ptrace.h>	/* user_enable_single_step */
 #include <linux/kdebug.h>	/* notifier mechanism */
+#include "../../mm/internal.h"	/* munlock_vma_page */
 
 #include <linux/uprobes.h>
 
@@ -141,7 +142,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr,
 	pte_t *ptep;
 	int err;
 
-	/* freeze PageSwapCache() for try_to_free_swap() below */
+	/* For try_to_free_swap() and munlock_vma_page() below */
 	lock_page(page);
 
 	err = -EAGAIN;
@@ -164,9 +165,12 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr,
 	page_remove_rmap(page);
 	if (!page_mapped(page))
 		try_to_free_swap(page);
-	put_page(page);
 	pte_unmap_unlock(ptep, ptl);
 
+	if (vma->vm_flags & VM_LOCKED)
+		munlock_vma_page(page);
+	put_page(page);
+
 	err = 0;
  unlock:
 	unlock_page(page);