Commit 3dece370 authored Jan 21, 2011 by Michal Simek Committed by Linus Torvalds Jan 21, 2011

mm: System without MMU do not need pte_mkwrite



The patch "thp: export maybe_mkwrite" (commit 14fd403f) 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 <monstr@monstr.eu>
CC: Andrea Arcangeli <aarcange@redhat.com>
Reviewed-by: Rik van Riel <riel@redhat.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent db9fd848

include/linux/mm.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		#endif

		/*
		* Multiple processes may "see" the same page. E.g. for untouched