aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2010-08-26 11:00:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 17:01:03 -0400
commitbad849b3dc0fae1297c8d47f846f8d202a6145ed (patch)
treed3802e46cbda7f6df30a9b0378e15a8343572a19 /include/linux
parent0a3b6e452b403f6e0cf3000da87b19e0fd9c4ba3 (diff)
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>
Diffstat (limited to 'include/linux')
-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 831c693416b2..e6b1210772ce 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)
1363 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; 1363 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
1364} 1364}
1365 1365
1366#ifdef CONFIG_MMU
1366pgprot_t vm_get_page_prot(unsigned long vm_flags); 1367pgprot_t vm_get_page_prot(unsigned long vm_flags);
1368#else
1369static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
1370{
1371 return __pgprot(0);
1372}
1373#endif
1374
1367struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); 1375struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
1368int remap_pfn_range(struct vm_area_struct *, unsigned long addr, 1376int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
1369 unsigned long pfn, unsigned long size, pgprot_t); 1377 unsigned long pfn, unsigned long size, pgprot_t);