diff --git a/[refs] b/[refs]
index c0263afc1a0b..3250707f0081 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 185e4188dab6456409cad66c579501dd89487188
+refs/heads/master: 3d4c6826ed2a28e69e8ee14f1d58c4c8622f04b3
diff --git a/trunk/arch/powerpc/include/asm/kvm_asm.h b/trunk/arch/powerpc/include/asm/kvm_asm.h
index 7d4018dd0e11..76fdcfef0889 100644
--- a/trunk/arch/powerpc/include/asm/kvm_asm.h
+++ b/trunk/arch/powerpc/include/asm/kvm_asm.h
@@ -20,6 +20,7 @@
 #ifndef __POWERPC_KVM_ASM_H__
 #define __POWERPC_KVM_ASM_H__
 
+#ifdef __ASSEMBLY__
 #ifdef CONFIG_64BIT
 #define PPC_STD(sreg, offset, areg)  std sreg, (offset)(areg)
 #define PPC_LD(treg, offset, areg)   ld treg, (offset)(areg)
@@ -27,6 +28,7 @@
 #define PPC_STD(sreg, offset, areg)  stw sreg, (offset+4)(areg)
 #define PPC_LD(treg, offset, areg)   lwz treg, (offset+4)(areg)
 #endif
+#endif
 
 /* IVPR must be 64KiB-aligned. */
 #define VCPU_SIZE_ORDER 4