Skip to content

Commit

Permalink
m68k: __pa(): cast arg to long
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Geert Uytterhoeven committed Oct 22, 2010
1 parent 8ce71db commit 22e58f9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/m68k/include/asm/page_mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 22e58f9

Please sign in to comment.