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:
81c5a68
)
mn10300: kmap_atomic() returns void *, not unsigned long...
author
Al Viro
<viro@zeniv.linux.org.uk>
Sun, 2 Feb 2014 11:31:19 +0000
(06:31 -0500)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Wed, 2 Apr 2014 03:19:17 +0000
(23:19 -0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
arch/mn10300/include/asm/highmem.h
patch
|
blob
|
history
diff --git
a/arch/mn10300/include/asm/highmem.h
b/arch/mn10300/include/asm/highmem.h
index 7c137cd8aa37490e07e2e9b7e917785e63236f5b..2fbbe4d920aa2efb353ed5fd52babaf309a386db 100644
(file)
--- a/
arch/mn10300/include/asm/highmem.h
+++ b/
arch/mn10300/include/asm/highmem.h
@@
-70,7
+70,7
@@
static inline void kunmap(struct page *page)
* be used in IRQ contexts, so in some (very limited) cases we need
* it.
*/
-static inline
unsigned long
kmap_atomic(struct page *page)
+static inline
void *
kmap_atomic(struct page *page)
{
unsigned long vaddr;
int idx, type;
@@
-89,7
+89,7
@@
static inline unsigned long kmap_atomic(struct page *page)
set_pte(kmap_pte - idx, mk_pte(page, kmap_prot));
local_flush_tlb_one(vaddr);
- return vaddr;
+ return
(void *)
vaddr;
}
static inline void __kunmap_atomic(unsigned long vaddr)