diff --git a/[refs] b/[refs]
index eaed00c44e6c..6483c7ca4245 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 665605a2a207dbe1fa429b474f932d6ea138ba92
+refs/heads/master: 2fd611a991391a6050cbd139201a2e12fc306540
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index bed2161620d7..9db9cdf8ff34 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -1082,6 +1082,9 @@ void uprobe_munmap(struct vm_area_struct *vma, unsigned long start, unsigned lon
 	if (!atomic_read(&uprobe_events) || !valid_vma(vma, false))
 		return;
 
+	if (!atomic_read(&vma->vm_mm->mm_users)) /* called by mmput() ? */
+		return;
+
 	if (!atomic_read(&vma->vm_mm->uprobes_state.count))
 		return;