lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: PPC: Book3S HV: Fix compilation without CONFIG_PPC_POWERNV

Browse Source 
Fixes this build breakage:

arch/powerpc/kvm/book3s_hv_ras.c: In function ‘kvmppc_realmode_mc_power7’:
arch/powerpc/kvm/book3s_hv_ras.c:126:23: error: ‘struct paca_struct’ has no member named ‘opal_mc_evt’

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Andreas Schwab
2012-12-22 04:09:17 +00:00
committed by Alexander Graf
parent 1509ae56cd
commit d591390da9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kvm/book3s_hv_ras.c
View File

@@ -79,7 +79,9 @@ static void flush_tlb_power7(struct kvm_vcpu *vcpu)
static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu)
{ {
unsigned long srr1 = vcpu->arch.shregs.msr; unsigned long srr1 = vcpu->arch.shregs.msr;
#ifdef CONFIG_PPC_POWERNV
struct opal_machine_check_event *opal_evt; struct opal_machine_check_event *opal_evt;
#endif
long handled = 1; long handled = 1;
if (srr1 & SRR1_MC_LDSTERR) { if (srr1 & SRR1_MC_LDSTERR) {
@@ -117,6 +119,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu)
handled = 0; handled = 0;
} }
#ifdef CONFIG_PPC_POWERNV
/* /*
* See if OPAL has already handled the condition. * See if OPAL has already handled the condition.
* We assume that if the condition is recovered then OPAL * We assume that if the condition is recovered then OPAL
@@ -131,6 +134,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu)
if (handled) if (handled)
opal_evt->in_use = 0; opal_evt->in_use = 0;
#endif
return handled; return handled;
} }