From a3dd45cc9f3a8f655f054f73fdfed666c0567f38 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 26 Aug 2010 16:00:34 +0100
Subject: [PATCH] --- yaml --- r: 210030 b: refs/heads/master c:
 bad849b3dc0fae1297c8d47f846f8d202a6145ed h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b7d8d3c5ff4d..71c192641151 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a3b6e452b403f6e0cf3000da87b19e0fd9c4ba3
+refs/heads/master: bad849b3dc0fae1297c8d47f846f8d202a6145ed
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 831c693416b2..e6b1210772ce 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -1363,7 +1363,15 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
 	return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 }
 
+#ifdef CONFIG_MMU
 pgprot_t vm_get_page_prot(unsigned long vm_flags);
+#else
+static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
+{
+	return __pgprot(0);
+}
+#endif
+
 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
 			unsigned long pfn, unsigned long size, pgprot_t);