Commit 768237cf authored by Mahesh Salgaonkar's avatar Mahesh Salgaonkar Committed by Luis Henriques

powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER

commit 44d5f6f5 upstream.

commit id 2ba9f0d8 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: 2ba9f0d8 ("kvm: powerpc: book3s: Support building HV and PR KVM as module")
Signed-off-by: default avatarMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 774b8334
...@@ -1442,7 +1442,7 @@ machine_check_handle_early: ...@@ -1442,7 +1442,7 @@ machine_check_handle_early:
bne 9f /* continue in V mode if we are. */ bne 9f /* continue in V mode if we are. */
5: 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 * We are coming from kernel context. Check if we are coming from
* guest. if yes, then we can continue. We will fall through * guest. if yes, then we can continue. We will fall through
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment