From: Paolo 'Blaisorblade' Giarrusso Date: Wed, 11 Oct 2006 08:21:32 +0000 (-0700) Subject: [PATCH] uml: correct removal of pte_mkexec X-Git-Tag: v2.6.19-rc2~96 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=21c935e5298a3bc4f16cdff7ce3b1efab92b995e;p=~shefty%2Frdma-dev.git [PATCH] uml: correct removal of pte_mkexec 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 Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c index c17eddcf89b..2c6d090a2e8 100644 --- a/arch/um/kernel/skas/mmu.c +++ b/arch/um/kernel/skas/mmu.c @@ -60,10 +60,7 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc, #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: