---

yaml --- r: 343483 b: refs/heads/master c: d61966f h: refs/heads/master i: 343481: 746dd33 343479: 2712454 v: v3
git-mirror · Oct 5, 2012 · bc7ed54 · bc7ed54
1 parent f5c148c
commit bc7ed54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a08c2740f07fb8c3769d1f137721835ead7652f
+refs/heads/master: d61966fc08b84857b697ebae4489c652dd87e48a
diff --git a/trunk/arch/powerpc/include/asm/kvm_booke_hv_asm.h b/trunk/arch/powerpc/include/asm/kvm_booke_hv_asm.h
@@ -38,9 +38,9 @@
 #ifdef CONFIG_KVM_BOOKE_HV
 BEGIN_FTR_SECTION
 	mtocrf	0x80, r11	/* check MSR[GS] without clobbering reg */
-	bf	3, kvmppc_resume_\intno\()_\srr1
+	bf	3, 1975f
 	b	kvmppc_handler_\intno\()_\srr1
-kvmppc_resume_\intno\()_\srr1:
+1975:
 END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV)
 #endif
 .endm