提交 ea56f411 编写于 作者: D David Howells 提交者: Linus Torvalds

frv: hide uncached_access() when pgprot_noncached is not #defined

Hide uncached_access() when pgprot_noncached is not #defined.  This prevents
the following warning:

	  CC      drivers/char/mem.o
	drivers/char/mem.c:229: warning: 'uncached_access' defined but not used

Repairs d7d4d849 ("drivers/char/mem.c:
cleanups").
Signed-off-by: NDavid Howells <dhowells@redhat.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 c783a29e
...@@ -225,6 +225,7 @@ int __weak phys_mem_access_prot_allowed(struct file *file, ...@@ -225,6 +225,7 @@ int __weak phys_mem_access_prot_allowed(struct file *file,
* outside of main memory. * outside of main memory.
* *
*/ */
#ifdef pgprot_noncached
static int uncached_access(struct file *file, unsigned long addr) static int uncached_access(struct file *file, unsigned long addr)
{ {
#if defined(CONFIG_IA64) #if defined(CONFIG_IA64)
...@@ -251,6 +252,7 @@ static int uncached_access(struct file *file, unsigned long addr) ...@@ -251,6 +252,7 @@ static int uncached_access(struct file *file, unsigned long addr)
return addr >= __pa(high_memory); return addr >= __pa(high_memory);
#endif #endif
} }
#endif
static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
unsigned long size, pgprot_t vma_prot) unsigned long size, pgprot_t vma_prot)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册