Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / arch / um / kernel / skas / mmu.c

diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
index 4cd2ff546ef6f9d322b2f882ca182bf5315cf7c9..2c6d090a2e872b11d891c2510a1e4f55ef52dd17 100644 (file)
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
@@ -3,7 +3,6 @@
  * Licensed under the GPL
  */
 
-#include "linux/config.h"
 #include "linux/sched.h"
 #include "linux/list.h"
 #include "linux/spinlock.h"
@@ -61,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: