Index: arch/ppc64/include/asm.h
===================================================================
--- arch/ppc64/include/asm.h	(revision 48c1ef99601d3c28d9577147199e8e4f36174b69)
+++ arch/ppc64/include/asm.h	(revision 040542aa18c2031f9e751738ff84939e979b0d49)
@@ -139,5 +139,11 @@
 }
 
-void cpu_halt(void);
+static inline void cpu_halt(void)
+{
+	asm volatile (
+		"b 0\n"
+	);
+}
+
 void asm_delay_loop(__u32 t);
 
Index: arch/ppc64/include/types.h
===================================================================
--- arch/ppc64/include/types.h	(revision 48c1ef99601d3c28d9577147199e8e4f36174b69)
+++ arch/ppc64/include/types.h	(revision 040542aa18c2031f9e751738ff84939e979b0d49)
@@ -47,5 +47,5 @@
 typedef __u64 ipl_t;
 
-typedef __u32 __native;
+typedef __u64 __native;
 
 /** Page Table Entry. */