diff options
| author | Mihai Caraman <mihai.caraman@freescale.com> | 2012-09-12 03:18:14 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-05 23:38:50 +0200 |
| commit | d61966fc08b84857b697ebae4489c652dd87e48a (patch) | |
| tree | eac7b5c287b1ca3ff8124e25e70771d974d0112c /arch/powerpc/include/asm/kvm_booke_hv_asm.h | |
| parent | 7a08c2740f07fb8c3769d1f137721835ead7652f (diff) | |
| download | blackbird-op-linux-d61966fc08b84857b697ebae4489c652dd87e48a.tar.gz blackbird-op-linux-d61966fc08b84857b697ebae4489c652dd87e48a.zip | |
KVM: PPC: bookehv: Allow duplicate calls of DO_KVM macro
The current form of DO_KVM macro restricts its use to one call per input
parameter set. This is caused by kvmppc_resume_\intno\()_\srr1 symbol
definition.
Duplicate calls of DO_KVM are required by distinct implementations of
exeption handlers which are delegated at runtime. Use a rare label number
to avoid conflicts with the calling contexts.
Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/include/asm/kvm_booke_hv_asm.h')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/kvm_booke_hv_asm.h b/arch/powerpc/include/asm/kvm_booke_hv_asm.h index 30a600fa1b6a..a37a12a9a7d7 100644 --- a/arch/powerpc/include/asm/kvm_booke_hv_asm.h +++ b/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 |
