diff --git a/[refs] b/[refs]
index 5d078e2365d5..5f895b88e27e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a604b38036bee1483fb98a520c69895d5d6276a6
+refs/heads/master: 318aa296c329625916c47703eab906d6ebf13930
diff --git a/trunk/arch/x86/mm/fault_32.c b/trunk/arch/x86/mm/fault_32.c
index b1893ebf6456..421e276770ad 100644
--- a/trunk/arch/x86/mm/fault_32.c
+++ b/trunk/arch/x86/mm/fault_32.c
@@ -404,7 +404,8 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 	 * protection error (error_code & 9) == 0.
 	 */
 	if (unlikely(address >= TASK_SIZE)) {
-		if (!(error_code & 0x0000000d) && vmalloc_fault(address) >= 0)
+		if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) &&
+		    vmalloc_fault(address) >= 0)
 			return;
 		if (notify_page_fault(regs))
 			return;
@@ -603,7 +604,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 		__typeof__(pte_val(__pte(0))) page;
 
 #ifdef CONFIG_X86_PAE
-		if (error_code & 16) {
+		if (error_code & PF_INSTR) {
 			pte_t *pte = lookup_address(address);
 
 			if (pte && pte_present(*pte) && !pte_exec_kernel(*pte))
@@ -674,7 +675,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 		goto survive;
 	}
 	printk("VM: killing process %s\n", tsk->comm);
-	if (error_code & 4)
+	if (error_code & PF_USER)
 		do_group_exit(SIGKILL);
 	goto no_context;
 
diff --git a/trunk/arch/x86/mm/fault_64.c b/trunk/arch/x86/mm/fault_64.c
index 058b04cb96d4..95f142f5b5cc 100644
--- a/trunk/arch/x86/mm/fault_64.c
+++ b/trunk/arch/x86/mm/fault_64.c
@@ -677,7 +677,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 		goto again;
 	}
 	printk("VM: killing process %s\n", tsk->comm);
-	if (error_code & 4)
+	if (error_code & PF_USER)
 		do_group_exit(SIGKILL);
 	goto no_context;