From 500991d9285825833769d2df9e4d49e71bfc1ead Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Sat, 2 Oct 2010 19:32:41 +0200
Subject: [PATCH] --- yaml --- r: 213299 b: refs/heads/master c:
 22e58f9de5d140116eb3a30d5e54396e3030bed2 h: refs/heads/master i:   213297:
 b5c1d22876096858d9523876a5e15e09387d5f03   213295:
 b8d6348089c4846e1ef47af8fe013616e0d874bf v: v3

---
 [refs]                                | 2 +-
 trunk/arch/m68k/include/asm/page_mm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4afcf438c31a..9191280f97e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ce71db25edccde4d8e3e39bffb4178bf1018ef1
+refs/heads/master: 22e58f9de5d140116eb3a30d5e54396e3030bed2
diff --git a/trunk/arch/m68k/include/asm/page_mm.h b/trunk/arch/m68k/include/asm/page_mm.h
index 66f0b3938cbb..31d5570d6567 100644
--- a/trunk/arch/m68k/include/asm/page_mm.h
+++ b/trunk/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;