diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-09-29 01:58:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 09:18:04 -0700 |
| commit | 5906e4171ad61ce68de95e51b773146707671f80 (patch) | |
| tree | e8e2479c9fa361948d10740b7e65e4eb751ee8c0 /arch/um | |
| parent | fade5d5461b0379b27ca96faf560d855d7a0ea8b (diff) | |
| download | kernel-crypto-5906e4171ad61ce68de95e51b773146707671f80.tar.gz kernel-crypto-5906e4171ad61ce68de95e51b773146707671f80.tar.xz kernel-crypto-5906e4171ad61ce68de95e51b773146707671f80.zip | |
[PATCH] uml: remove pte_mkexec
Andi is making pte_mkexec go away, and UML had one of the last uses.
This removes the use and the definition.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Andi Kleen <ak@muc.de>
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c index 79c22707a63..4cd2ff546ef 100644 --- a/arch/um/kernel/skas/mmu.c +++ b/arch/um/kernel/skas/mmu.c @@ -61,8 +61,10 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc, #endif *pte = mk_pte(virt_to_page(kernel), __pgprot(_PAGE_PRESENT)); - *pte = pte_mkexec(*pte); - *pte = pte_wrprotect(*pte); + /* 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); return(0); out_pmd: |