]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER
authorMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Tue, 17 Mar 2015 10:44:41 +0000 (16:14 +0530)
committerSasha Levin <sasha.levin@oracle.com>
Fri, 17 Apr 2015 00:13:16 +0000 (20:13 -0400)
commitbac01bf2da68672590990f13e8d1e9c0b1c6ed63
tree98b174eb0b92e2ea88140005909e329aa83ec5ec
parent32ac769b9d4183291b3afaa1e3222afea5614486
powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER

[ Upstream commit 44d5f6f5901e996744858c175baee320ccf1eda3 ]

commit id 2ba9f0d has 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.

Fixes: 2ba9f0d88750 ("kvm: powerpc: book3s: Support building HV and PR KVM as module")
Cc: stable@vger.kernel.org # v3.14+
Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
arch/powerpc/kernel/exceptions-64s.S