summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2010-08-26 16:00:34 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:01:03 -0700
commitbad849b3dc0fae1297c8d47f846f8d202a6145ed (patch)
treed3802e46cbda7f6df30a9b0378e15a8343572a19
parent0a3b6e452b403f6e0cf3000da87b19e0fd9c4ba3 (diff)
downloadlinux-3.10-bad849b3dc0fae1297c8d47f846f8d202a6145ed.tar.gz
linux-3.10-bad849b3dc0fae1297c8d47f846f8d202a6145ed.tar.bz2
linux-3.10-bad849b3dc0fae1297c8d47f846f8d202a6145ed.zip
NOMMU: Stub out vm_get_page_prot() if there's no MMU
Stub out vm_get_page_prot() if there's no MMU. This was added by commit 804af2cf6e7a ("[AGPGART] remove private page protection map") and is used in commit c07fbfd17e61 ("fbmem: VM_IO set, but not propagated") in the fbmem video driver, but the function doesn't exist on NOMMU, resulting in an undefined symbol at link time. Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/mm.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 831c693416b..e6b1210772c 100644
--- a/include/linux/mm.h
+++ b/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);