diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-10-11 01:21:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:14:20 -0700 |
| commit | 21c935e5298a3bc4f16cdff7ce3b1efab92b995e (patch) | |
| tree | 63f337847f0ac7037ab157c1858626ae7ba7ca5b /arch/um | |
| parent | 1875a48fed4239769bacb039175a52e42b0ebd71 (diff) | |
| download | op-kernel-dev-21c935e5298a3bc4f16cdff7ce3b1efab92b995e.zip op-kernel-dev-21c935e5298a3bc4f16cdff7ce3b1efab92b995e.tar.gz | |
[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 <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/kernel/skas/mmu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c index c17eddc..2c6d090 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: |
