Index: arch/ppc64/include/mm/page.h
===================================================================
--- arch/ppc64/include/mm/page.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/ppc64/include/mm/page.h	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -44,6 +44,6 @@
 
 #ifndef __ASM__
-#	define KA2PA(x)	(((__address) (x)) - 0x80000000)
-#	define PA2KA(x)	(((__address) (x)) + 0x80000000)
+#	define KA2PA(x)	(((uintptr_t) (x)) - 0x80000000)
+#	define PA2KA(x)	(((uintptr_t) (x)) + 0x80000000)
 #else
 #	define KA2PA(x)	((x) - 0x80000000)
@@ -95,7 +95,7 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)	set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
 
-#define PTE_VALID_ARCH(pte)			(*((__u32 *) (pte)) != 0)
+#define PTE_VALID_ARCH(pte)			(*((uint32_t *) (pte)) != 0)
 #define PTE_PRESENT_ARCH(pte)			((pte)->p != 0)
-#define PTE_GET_FRAME_ARCH(pte)			((__address) ((pte)->pfn << 12))
+#define PTE_GET_FRAME_ARCH(pte)			((uintptr_t) ((pte)->pfn << 12))
 #define PTE_WRITABLE_ARCH(pte)			1
 #define PTE_EXECUTABLE_ARCH(pte)		1