openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Paul Mackerras 2016-11-24 14:10:43 +11:00
parent 2ee13be34b
commit e2702871b4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/kvm/book3s_hv_builtin.c
View File

@ -28,6 +28,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/asm-prototypes.h> #include <asm/asm-prototypes.h>
#include <asm/opal.h> #include <asm/opal.h>
#include <asm/smp.h>
#define KVM_CMA_CHUNK_ORDER 18 #define KVM_CMA_CHUNK_ORDER 18
@ -364,7 +365,7 @@ static int kvmppc_check_passthru(u32 xisr, __be32 xirr, bool *again)
} }
#else #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; return 1;
} }