Index: arch/ppc64/include/boot/boot.h
===================================================================
--- arch/ppc64/include/boot/boot.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/ppc64/include/boot/boot.h	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -49,26 +49,26 @@
 
 typedef struct {
-	__address addr;
-	__u64 size;
+	uintptr_t addr;
+	uint64_t size;
 } utask_t;
 
 typedef struct {
-	__u32 count;
+	uint32_t count;
 	utask_t tasks[TASKMAP_MAX_RECORDS];
 } taskmap_t;
 
 typedef struct {
-	__address start;
-	__u64 size;
+	uintptr_t start;
+	uint64_t size;
 } memzone_t;
 
 typedef struct {
-	__u64 total;
-	__u32 count;
+	uint64_t total;
+	uint32_t count;
 	memzone_t zones[MEMMAP_MAX_RECORDS];
 } memmap_t;
 
 typedef struct {
-	__address addr;
+	uintptr_t addr;
 	unsigned int width;
 	unsigned int height;