korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 d7d4d849b4 ("drivers/char/mem.c:
cleanups").

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Howells 2010-04-06 14:35:08 -07:00 committed by Linus Torvalds
parent c783a29efc
commit ea56f411ec
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/mem.c
View 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)
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)