diff options
| author | Al Viro | 2014-02-02 12:31:19 +0100 |
|---|---|---|
| committer | Al Viro | 2014-04-02 05:19:17 +0200 |
| commit | 3ef120a459260b35175a64a418bdb115d80bf58f (patch) | |
| tree | 3fc249b4d04f98c51948ce39581d4c71db7e344c | |
| parent | cifs: ->rename() without ->lookup() makes no sense (diff) | |
| download | kernel-qcow2-linux-3ef120a459260b35175a64a418bdb115d80bf58f.tar.gz kernel-qcow2-linux-3ef120a459260b35175a64a418bdb115d80bf58f.tar.xz kernel-qcow2-linux-3ef120a459260b35175a64a418bdb115d80bf58f.zip | |
mn10300: kmap_atomic() returns void *, not unsigned long...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -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) * 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) |