From patchwork Sat Dec 22 14:09:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 207932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 92AD62C0085 for ; Sun, 23 Dec 2012 01:09:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751308Ab2LVOJV (ORCPT ); Sat, 22 Dec 2012 09:09:21 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:53046 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113Ab2LVOJU (ORCPT ); Sat, 22 Dec 2012 09:09:20 -0500 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3YT7qf6267z4KK65; Sat, 22 Dec 2012 15:09:18 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3YT7qf3ClQzbbhh; Sat, 22 Dec 2012 15:09:18 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id eSO9QRyGLOJ7; Sat, 22 Dec 2012 15:09:17 +0100 (CET) X-Auth-Info: DiX5hg/4U5yOQ0QzG3QCJpdoxU9Gf2vcW4o/dFdJ8DA= Received: from igel.home (ppp-88-217-127-54.dynamic.mnet-online.de [88.217.127.54]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 22 Dec 2012 15:09:17 +0100 (CET) Received: by igel.home (Postfix, from userid 501) id 7892ACA2A2; Sat, 22 Dec 2012 15:09:17 +0100 (CET) From: Andreas Schwab To: Paul Mackerras Cc: Alexander Graf , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH] KVM: PPC: Book3S HV: Fix compilation without CONFIG_PPC_POWERNV 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> X-Yow: ONE: I will donate my entire ``BABY HUEY'' comic book collection to the downtown PLASMA CENTER.. TWO: I won't START a BAND called ``KHADAFY & THE HIT SQUAD''.. THREE: I won't ever TUMBLE DRY my FOX TERRIER again!! Date: Sat, 22 Dec 2012 15:09:17 +0100 In-Reply-To: <20121124083750.GD23537@bloggs.ozlabs.ibm.com> (Paul Mackerras's message of "Sat, 24 Nov 2012 19:37:50 +1100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.91 (gnu/linux) MIME-Version: 1.0 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org 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 --- 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 = vcpu->arch.shregs.msr; +#ifdef CONFIG_PPC_POWERNV struct opal_machine_check_event *opal_evt; +#endif long handled = 1; if (srr1 & SRR1_MC_LDSTERR) { @@ -117,6 +119,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) handled = 0; } +#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_vcpu *vcpu) if (handled) opal_evt->in_use = 0; +#endif return handled; }