diff --git a/[refs] b/[refs]
index a4c44ae08ebf..571d4d714987 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d129f31236c241c07e583e8bc695c382365d02ce
+refs/heads/master: 16b036786a6bd08cf7a91e0cd58219a6717da2a6
diff --git a/trunk/arch/um/kernel/trap_kern.c b/trunk/arch/um/kernel/trap_kern.c
index d20361dcd127..87cc6fd76ced 100644
--- a/trunk/arch/um/kernel/trap_kern.c
+++ b/trunk/arch/um/kernel/trap_kern.c
@@ -85,8 +85,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
 		pte = pte_offset_kernel(pmd, address);
 	} while(!pte_present(*pte));
 	err = 0;
-	*pte = pte_mkyoung(*pte);
-	if(pte_write(*pte)) *pte = pte_mkdirty(*pte);
+	WARN_ON(!pte_young(*pte) || (is_write && !pte_dirty(*pte)));
 	flush_tlb_page(vma, address);
 out:
 	up_read(&mm->mmap_sem);