From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mahesh J Salgaonkar Subject: [RESEND PATCH v2] powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER Date: Mon, 23 Mar 2015 22:28:33 +0530 Message-ID: <20150323165820.18559.56145.stgit@mars> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: KVM , Alexander Graf , KVM-PPC , "Aneesh Kumar K.V" , stable@vger.kernel.org#v3.14+, David Gibson , stable@vger.kernel.org To: linuxppc-dev , Paul Mackerras , Michael Ellerman Return-path: Sender: stable-owner@vger.kernel.org List-Id: kvm.vger.kernel.org From: Mahesh Salgaonkar commit id 2ba9f0d changed CONFIG_KVM_BOOK3S_64_HV to tristate to allow HV/PR bits to be built as modules. But the MCE code still depends on CONFIG_KVM_BOOK3S_64_HV which is wrong. When user selects CONFIG_KVM_BOOK3S_64_HV=m to build HV/PR bits as a separate module the relevant MCE code gets excluded. This patch fixes the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER. This makes sure that the relevant MCE code is included when HV/PR bits are built as a separate modules. Signed-off-by: Mahesh Salgaonkar Acked-by: Paul Mackerras Cc: stable@vger.kernel.org # v3.14+ --- arch/powerpc/kernel/exceptions-64s.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index c2df815..9519e6b 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1408,7 +1408,7 @@ machine_check_handle_early: bne 9f /* continue in V mode if we are. */ 5: -#ifdef CONFIG_KVM_BOOK3S_64_HV +#ifdef CONFIG_KVM_BOOK3S_64_HANDLER /* * We are coming from kernel context. Check if we are coming from * guest. if yes, then we can continue. We will fall through