[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20100826150034.22254.54402.stgit@warthog.procyon.org.uk>
Date: Thu, 26 Aug 2010 16:00:34 +0100
From: David Howells <dhowells@...hat.com>
To: torvalds@...l.org, akpm@...ux-foundation.org
Cc: vapier.adi@...il.com, konrad.wilk@...cle.com,
gavinl@...pacsort.com, uclinux-dev@...inux.org,
linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com>
Subject: [PATCH] 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:
commit 804af2cf6e7af31d2e664b54e657dddd9b531dbd
Author: Hugh Dickins <hugh@...itas.com>
Date: Wed Jul 26 21:39:49 2006 +0100
Subject: [AGPGART] remove private page protection map
and is used in commit:
commit c07fbfd17e614a76b194f371c5331e21e6cffb54
Author: Daniel De Graaf <dgdegra@...ho.nsa.gov>
Date: Tue Aug 10 18:02:45 2010 -0700
Subject: 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@...hat.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
---
include/linux/mm.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 831c693..e6b1210 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists