diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-02-02 06:31:19 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-01 23:19:17 -0400 |
commit | 3ef120a459260b35175a64a418bdb115d80bf58f (patch) | |
tree | 3fc249b4d04f98c51948ce39581d4c71db7e344c /arch | |
parent | 81c5a68478be38816bb5110ae0a5de1320cd2dfd (diff) |
mn10300: kmap_atomic() returns void *, not unsigned long...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mn10300/include/asm/highmem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mn10300/include/asm/highmem.h b/arch/mn10300/include/asm/highmem.h index 7c137cd8aa37..2fbbe4d920aa 100644 --- 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) | |||
70 | * be used in IRQ contexts, so in some (very limited) cases we need | 70 | * be used in IRQ contexts, so in some (very limited) cases we need |
71 | * it. | 71 | * it. |
72 | */ | 72 | */ |
73 | static inline unsigned long kmap_atomic(struct page *page) | 73 | static inline void *kmap_atomic(struct page *page) |
74 | { | 74 | { |
75 | unsigned long vaddr; | 75 | unsigned long vaddr; |
76 | int idx, type; | 76 | int idx, type; |
@@ -89,7 +89,7 @@ static inline unsigned long kmap_atomic(struct page *page) | |||
89 | set_pte(kmap_pte - idx, mk_pte(page, kmap_prot)); | 89 | set_pte(kmap_pte - idx, mk_pte(page, kmap_prot)); |
90 | local_flush_tlb_one(vaddr); | 90 | local_flush_tlb_one(vaddr); |
91 | 91 | ||
92 | return vaddr; | 92 | return (void *)vaddr; |
93 | } | 93 | } |
94 | 94 | ||
95 | static inline void __kunmap_atomic(unsigned long vaddr) | 95 | static inline void __kunmap_atomic(unsigned long vaddr) |