From: Andrew Morton <akpm@linux-foundation.org>
Date: Sat, 2 Oct 2010 17:32:41 +0000 (+0200)
Subject: m68k: __pa(): cast arg to long
X-Git-Tag: v2.6.37-rc1~160^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22e58f9de5d140116eb3a30d5e54396e3030bed2;p=thirdparty%2Flinux.git

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>
---

diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index 66f0b3938cbb5..31d5570d65676 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;