From 04f4d39c9647b3b70d93a79a6805a22e9bc4a45e Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Fri, 21 Jan 2011 08:49:56 +0100
Subject: [PATCH] --- yaml --- r: 232035 b: refs/heads/master c:
 3dece370ecc7c6152b3fdd21c6de28179f6e643d h: refs/heads/master i:   232033:
 90305489a83852b0fa2ecd4f5747e11a5f59cfff   232031:
 ed895c095018fc760b1d6bf9739698b19af2e7e5 v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/mm.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ecbe349ddf4..0eea8851e0c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db9fd8486bfe895b00b3603685c086a3c8210ffe
+refs/heads/master: 3dece370ecc7c6152b3fdd21c6de28179f6e643d
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 956a35532f47..f6385fc17ad4 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/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;
 }
+#endif
 
 /*
  * Multiple processes may "see" the same page. E.g. for untouched