diff --git a/[refs] b/[refs]
index 4555b9e5a290..68e797de23a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dad5451a322bb682704f3ab13a558508a83e0b93
+refs/heads/master: 7bf9b7bef881aac820bf1f2e9951a17b09bd7e04
diff --git a/trunk/arch/arm/kernel/swp_emulate.c b/trunk/arch/arm/kernel/swp_emulate.c
index df745188f5de..ab1017bd1667 100644
--- a/trunk/arch/arm/kernel/swp_emulate.c
+++ b/trunk/arch/arm/kernel/swp_emulate.c
@@ -109,10 +109,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr)
 {
 	siginfo_t info;
 
+	down_read(&current->mm->mmap_sem);
 	if (find_vma(current->mm, addr) == NULL)
 		info.si_code = SEGV_MAPERR;
 	else
 		info.si_code = SEGV_ACCERR;
+	up_read(&current->mm->mmap_sem);
 
 	info.si_signo = SIGSEGV;
 	info.si_errno = 0;