From: David Howells Date: Tue, 6 Apr 2010 21:35:08 +0000 (-0700) Subject: frv: hide uncached_access() when pgprot_noncached is not #defined X-Git-Tag: upstream/snapshot3+hdmi~14874 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea56f411ec2d4d8689eb7f3bcd24e860acf87c47;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 d7d4d849b4e3acc405ec222884936800ffb26d48 ("drivers/char/mem.c: cleanups"). Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 9cdbadc..f54dab8 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -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)