From 92866af3393b6d8522055cb23a23da03306fa977 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@intel.linux.com>
Date: Sat, 25 Mar 2006 16:30:10 +0100
Subject: [PATCH] --- yaml --- r: 23813 b: refs/heads/master c:
 a9ba9a3b3897561d01e04cd21433746df46548c0 h: refs/heads/master i:   23811:
 5aacbff211050f9403e0c587ead7901a9fe11cd6 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86_64/mm/fault.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f27c7cab00a3..035e916ed82f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bc32c4d5cde5c57edcc9c2fe5057da8a4dd0153
+refs/heads/master: a9ba9a3b3897561d01e04cd21433746df46548c0
diff --git a/trunk/arch/x86_64/mm/fault.c b/trunk/arch/x86_64/mm/fault.c
index de91e17daf6f..316c53de47bd 100644
--- a/trunk/arch/x86_64/mm/fault.c
+++ b/trunk/arch/x86_64/mm/fault.c
@@ -314,11 +314,13 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 	unsigned long flags;
 	siginfo_t info;
 
+	tsk = current;
+	mm = tsk->mm;
+	prefetchw(&mm->mmap_sem);
+
 	/* get the address */
 	__asm__("movq %%cr2,%0":"=r" (address));
 
-	tsk = current;
-	mm = tsk->mm;
 	info.si_code = SEGV_MAPERR;