---

yaml
---
r: 115199
b: refs/heads/master
c: 3a1dfe6
h: refs/heads/master
i:
  115197: 6e46d4a
  115195: 66257fe
  115191: ca35782
  115183: c9d51d6
  115167: 0f6852e
  115135: 83b9320
  115071: ba9c770
  114943: 7e4cd73
  114687: b5e6a13
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 891cffbd6bcba26409869c19c07ecd4bfc0c2460
+refs/heads/master: 3a1dfe6eefe483589c99c909202ffe1a20d589b5

trunk/arch/x86/mm/fault.c

@@ -671,7 +671,8 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 		goto bad_area_nosemaphore;
 
 again:
-	/* When running in the kernel we expect faults to occur only to
+	/*
+	 * When running in the kernel we expect faults to occur only to
 	 * addresses in user space.  All other faults represent errors in the
 	 * kernel and should generate an OOPS.  Unfortunately, in the case of an
 	 * erroneous fault occurring in a code path which already holds mmap_sem
@@ -734,9 +735,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 			goto bad_area;
 	}
 
-#ifdef CONFIG_X86_32
-survive:
-#endif
 	/*
 	 * If for any reason at all we couldn't handle the fault,
 	 * make sure we exit gracefully rather than endlessly redo
@@ -871,12 +869,11 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 	up_read(&mm->mmap_sem);
 	if (is_global_init(tsk)) {
 		yield();
-#ifdef CONFIG_X86_32
-		down_read(&mm->mmap_sem);
-		goto survive;
-#else
+		/*
+		 * Re-lookup the vma - in theory the vma tree might
+		 * have changed:
+		 */
 		goto again;
-#endif
 	}
 
 	printk("VM: killing process %s\n", tsk->comm);