diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2016-11-24 04:10:43 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2016-11-24 04:20:00 +0100 |
| commit | e2702871b4b70a39e08c46744a8fa16e281120aa (patch) | |
| tree | 5630c4c4ada3e16078c139e44abd32d7bc850ca9 /arch/powerpc/kvm | |
| parent | KVM: PPC: Book3S HV: Update kvmppc_set_arch_compat() for ISA v3.00 (diff) | |
| download | linux-e2702871b4b70a39e08c46744a8fa16e281120aa.tar.xz linux-e2702871b4b70a39e08c46744a8fa16e281120aa.zip | |
KVM: PPC: Book3S HV: Fix compilation with unusual configurations
This adds the "again" parameter to the dummy version of
kvmppc_check_passthru(), so that it matches the real version.
This fixes compilation with CONFIG_BOOK3S_64_HV set but
CONFIG_KVM_XICS=n.
This includes asm/smp.h in book3s_hv_builtin.c to fix compilation
with CONFIG_SMP=n. The explicit inclusion is necessary to provide
definitions of hard_smp_processor_id() and get_hard_smp_processor_id()
in UP configs.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_builtin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c index 9e1223a81138..11561f0ef83a 100644 --- a/arch/powerpc/kvm/book3s_hv_builtin.c +++ b/arch/powerpc/kvm/book3s_hv_builtin.c @@ -28,6 +28,7 @@ #include <asm/io.h> #include <asm/asm-prototypes.h> #include <asm/opal.h> +#include <asm/smp.h> #define KVM_CMA_CHUNK_ORDER 18 @@ -364,7 +365,7 @@ static int kvmppc_check_passthru(u32 xisr, __be32 xirr, bool *again) } #else -static inline int kvmppc_check_passthru(u32 xisr, __be32 xirr) +static inline int kvmppc_check_passthru(u32 xisr, __be32 xirr, bool *again) { return 1; } |