---

yaml --- r: 307889 b: refs/heads/master c: 3d4c682 h: refs/heads/master i: 307887: 107b8a0 v: v3
git-mirror · May 6, 2012 · 8a6c78b · 8a6c78b
1 parent 47ce5b9
commit 8a6c78b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -20,13 +20,15 @@
 #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)
 #else
 #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