projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c783a29
)
frv: hide uncached_access() when pgprot_noncached is not #defined
author
David Howells
<
[email protected]
>
Tue, 6 Apr 2010 21:35:08 +0000
(14:35 -0700)
committer
Linus Torvalds
<
[email protected]
>
Wed, 7 Apr 2010 15:38:05 +0000
(08:38 -0700)
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 <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/char/mem.c
patch
|
blob
|
history
diff --git
a/drivers/char/mem.c
b/drivers/char/mem.c
index 9cdbadc6860814476ad147283dc2ba2675539509..f54dab8acdcd6561c742b0541afdae3828dedfd9 100644
(file)
--- 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)