Commit ea56f411 authored Apr 06, 2010 by David Howells Committed by Linus Torvalds Apr 07, 2010

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: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c783a29e

drivers/char/mem.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,7 @@ int __weak phys_mem_access_prot_allowed(struct file *file,
		* outside of main memory.
		*
		*/
		#ifdef pgprot_noncached
		static int uncached_access(struct file *file, unsigned long addr)
		{
		#if defined(CONFIG_IA64)
		@@ -251,6 +252,7 @@ static int uncached_access(struct file *file, unsigned long addr)
		return addr >= __pa(high_memory);
		#endif
		}
		#endif

		static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
		unsigned long size, pgprot_t vma_prot)

Admin message