Index: arch/amd64/include/mm/page.h
===================================================================
--- arch/amd64/include/mm/page.h	(revision f4a61effdafe71895306f6647d2e9b8e081603dc)
+++ arch/amd64/include/mm/page.h	(revision 3526da33e4658f241dd3248ee12d087085910c92)
@@ -36,6 +36,6 @@
 #define PAGE_SIZE	FRAME_SIZE
 
-#define KA2PA(x)	((x) - 0x80000000)
-#define PA2KA(x)	((x) + 0x80000000)
+#define KA2PA(x)	(((__address) (x)) - 0x80000000)
+#define PA2KA(x)	(((__address) (x)) + 0x80000000)
 
 #define PTL0_INDEX_ARCH(vaddr)		0
Index: arch/ia32/include/mm/page.h
===================================================================
--- arch/ia32/include/mm/page.h	(revision f4a61effdafe71895306f6647d2e9b8e081603dc)
+++ arch/ia32/include/mm/page.h	(revision 3526da33e4658f241dd3248ee12d087085910c92)
@@ -37,6 +37,6 @@
 #define PAGE_SIZE	FRAME_SIZE
 
-#define KA2PA(x)	((x) - 0x80000000)
-#define PA2KA(x)	((x) + 0x80000000)
+#define KA2PA(x)	(((__address) (x)) - 0x80000000)
+#define PA2KA(x)	(((__address) (x)) + 0x80000000)
 
 /*
Index: arch/ia64/include/mm/page.h
===================================================================
--- arch/ia64/include/mm/page.h	(revision f4a61effdafe71895306f6647d2e9b8e081603dc)
+++ arch/ia64/include/mm/page.h	(revision 3526da33e4658f241dd3248ee12d087085910c92)
@@ -35,6 +35,6 @@
 #define PAGE_SIZE	FRAME_SIZE
 
-#define KA2PA(x)	((x)-0x8000000000000000)
-#define PA2KA(x)	((x)+0x8000000000000000)
+#define KA2PA(x)	(((__address) (x))-0x8000000000000000)
+#define PA2KA(x)	(((__address) (x))+0x8000000000000000)
 
 #define page_arch_init()	;
Index: arch/mips/include/mm/page.h
===================================================================
--- arch/mips/include/mm/page.h	(revision f4a61effdafe71895306f6647d2e9b8e081603dc)
+++ arch/mips/include/mm/page.h	(revision 3526da33e4658f241dd3248ee12d087085910c92)
@@ -38,6 +38,6 @@
 #define PAGE_SIZE	FRAME_SIZE
 
-#define KA2PA(x)	((x) - 0x80000000)
-#define PA2KA(x)	((x) + 0x80000000)
+#define KA2PA(x)	(((__address) (x)) - 0x80000000)
+#define PA2KA(x)	(((__address) (x)) + 0x80000000)
 
 /*
Index: arch/ppc/include/mm/page.h
===================================================================
--- arch/ppc/include/mm/page.h	(revision f4a61effdafe71895306f6647d2e9b8e081603dc)
+++ arch/ppc/include/mm/page.h	(revision 3526da33e4658f241dd3248ee12d087085910c92)
@@ -36,6 +36,6 @@
 #define PAGE_SIZE	FRAME_SIZE
 
-#define KA2PA(x)	((x) - 0x80000000)
-#define PA2KA(x)	((x) + 0x80000000)
+#define KA2PA(x)	(((__address) (x)) - 0x80000000)
+#define PA2KA(x)	(((__address) (x)) + 0x80000000)
 
 #define PTL0_INDEX_ARCH(vaddr)		0