diff --git a/[refs] b/[refs] index de89904e603e..e1facef8d162 100644 --- 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 index 30a600fa1b6a..a37a12a9a7d7 100644 --- 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