diff options
authorMichal Simek <>2011-01-21 08:49:56 +0100
committerLinus Torvalds <>2011-01-21 08:40:30 -0800
commit3dece370ecc7c6152b3fdd21c6de28179f6e643d (patch)
parentdb9fd8486bfe895b00b3603685c086a3c8210ffe (diff)
mm: System without MMU do not need pte_mkwrite
The patch "thp: export maybe_mkwrite" (commit 14fd403f2146) breaks systems without MMU. Error log: CC arch/microblaze/mm/init.o In file included from include/linux/mman.h:14, from arch/microblaze/mm/consistent.c:24: include/linux/mm.h: In function 'maybe_mkwrite': include/linux/mm.h:482: error: implicit declaration of function 'pte_mkwrite' include/linux/mm.h:482: error: incompatible types in assignment Signed-off-by: Michal Simek <> CC: Andrea Arcangeli <> Reviewed-by: Rik van Riel <> CC: Andrew Morton <> CC: Ingo Molnar <> Signed-off-by: Linus Torvalds <>
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 956a35532f47..f6385fc17ad4 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -470,6 +470,7 @@ static inline void set_compound_order(struct page *page, unsigned long order)
page[1].lru.prev = (void *)order;
+#ifdef CONFIG_MMU
* Do pte_mkwrite, but only if the vma says VM_WRITE. We do this when
* servicing faults for write access. In the normal case, do always want
@@ -482,6 +483,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
pte = pte_mkwrite(pte);
return pte;
* Multiple processes may "see" the same page. E.g. for untouched