diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2010-10-02 19:32:41 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-10-22 09:43:25 +0200 |
| commit | 22e58f9de5d140116eb3a30d5e54396e3030bed2 (patch) | |
| tree | 2e3c7872075aa3b60e5f473ea4cc70f899ee008f /arch/m68k | |
| parent | 8ce71db25edccde4d8e3e39bffb4178bf1018ef1 (diff) | |
| download | talos-obmc-linux-22e58f9de5d140116eb3a30d5e54396e3030bed2.tar.gz talos-obmc-linux-22e58f9de5d140116eb3a30d5e54396e3030bed2.zip | |
m68k: __pa(): cast arg to long
Fixes this:
drivers/char/mem.c: In function 'mmap_kmem':
drivers/char/mem.c:342: warning: cast to pointer from integer of different size
by doing what other archtiectures do.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/page_mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index 66f0b3938cbb..31d5570d6567 100644 --- a/arch/m68k/include/asm/page_mm.h +++ b/arch/m68k/include/asm/page_mm.h @@ -80,7 +80,7 @@ static inline unsigned long ___pa(void *vaddr) : "0" (vaddr), "i" (m68k_fixup_memoffset)); return paddr; } -#define __pa(vaddr) ___pa((void *)(vaddr)) +#define __pa(vaddr) ___pa((void *)(long)(vaddr)) static inline void *__va(unsigned long paddr) { void *vaddr; |
