The patch titled uml: correct removal of pte_mkexec has been added to the -mm tree. Its filename is uml-correct-removal-of-pte_mkexec.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: uml: correct removal of pte_mkexec From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Correct commit 5906e4171ad61ce68de95e51b773146707671f80 - this makes more sense: we turn pte_mkexec + pte_wrprotect to pte_mkread. However, due to a bug in pte_mkread, it does the exact same thing as pte_mkwrite, so this patch improves the code but does not change anything in practice. The pte_mkread bug is fixed separately, as it may have big impact. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Cc: Jeff Dike <jdike@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/um/kernel/skas/mmu.c | 5 +---- 1 files changed, 1 insertion(+), 4 deletions(-) diff -puN arch/um/kernel/skas/mmu.c~uml-correct-removal-of-pte_mkexec arch/um/kernel/skas/mmu.c --- a/arch/um/kernel/skas/mmu.c~uml-correct-removal-of-pte_mkexec +++ a/arch/um/kernel/skas/mmu.c @@ -60,10 +60,7 @@ static int init_stub_pte(struct mm_struc #endif *pte = mk_pte(virt_to_page(kernel), __pgprot(_PAGE_PRESENT)); - /* This is wrong for the code page, but it doesn't matter since the - * stub is mapped by hand with the correct permissions. - */ - *pte = pte_mkwrite(*pte); + *pte = pte_mkread(*pte); return(0); out_pmd: _ Patches currently in -mm which might be from blaisorblade@xxxxxxxx are uml-fix-compilation-options-for-user_objs.patch uml-revert-wrong-patch.patch uml-correct-removal-of-pte_mkexec.patch uml-readd-forgot-prototype.patch uml-make-tt-mode-compile-after-setjmp-related-changes.patch uml-make-uml_setjmp-always-safe.patch uml-fix-processor-selection-to-exclude-unsupported-processors-and-features.patch uml-fix-uname-under-setarch-i386.patch uml-declare-in-kconfig-our-partial-lockdep-support.patch uml-allow-using-again-x86-x86_64-crypto-code.patch uml-asm-offsets-duplication-removal.patch uml-remove-duplicate-export.patch uml-deprecate-config_mode_tt.patch uml-allow-finer-tuning-for-host-vmsplit-setting.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html