From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Schwab Subject: [PATCH] KVM: PPC: Book3S HV: Fix compilation without CONFIG_PPC_POWERNV Date: Sat, 22 Dec 2012 15:09:17 +0100 Message-ID: References: <20121122092442.GA31117@bloggs.ozlabs.ibm.com> <20121122092555.GB31117@bloggs.ozlabs.ibm.com> <5E924DFD-5B00-4B3C-9933-575665FBD8B4@suse.de> <20121124083750.GD23537@bloggs.ozlabs.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Alexander Graf , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org To: Paul Mackerras Return-path: In-Reply-To: <20121124083750.GD23537@bloggs.ozlabs.ibm.com> (Paul Mackerras's message of "Sat, 24 Nov 2012 19:37:50 +1100") Sender: kvm-ppc-owner@vger.kernel.org List-Id: kvm.vger.kernel.org =46ixes this build breakage: arch/powerpc/kvm/book3s_hv_ras.c: In function =E2=80=98kvmppc_realmode_= mc_power7=E2=80=99: arch/powerpc/kvm/book3s_hv_ras.c:126:23: error: =E2=80=98struct paca_st= ruct=E2=80=99 has no member named =E2=80=98opal_mc_evt=E2=80=99 Signed-off-by: Andreas Schwab --- arch/powerpc/kvm/book3s_hv_ras.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s= _hv_ras.c index 35f3cf0..a353c48 100644 --- a/arch/powerpc/kvm/book3s_hv_ras.c +++ b/arch/powerpc/kvm/book3s_hv_ras.c @@ -79,7 +79,9 @@ static void flush_tlb_power7(struct kvm_vcpu *vcpu) static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) { unsigned long srr1 =3D vcpu->arch.shregs.msr; +#ifdef CONFIG_PPC_POWERNV struct opal_machine_check_event *opal_evt; +#endif long handled =3D 1; =20 if (srr1 & SRR1_MC_LDSTERR) { @@ -117,6 +119,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vc= pu *vcpu) handled =3D 0; } =20 +#ifdef CONFIG_PPC_POWERNV /* * See if OPAL has already handled the condition. * We assume that if the condition is recovered then OPAL @@ -131,6 +134,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vc= pu *vcpu) =20 if (handled) opal_evt->in_use =3D 0; +#endif =20 return handled; } --=20 1.8.0.2 --=20 Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4= ED5 "And now for something completely different."