| Message ID | 1462929355-30681-1-git-send-email-gwshan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 11/05/16 11:15, Gavin Shan wrote: > When CONFIG_KVM_XICS is enabled, CPU_UP_PREPARE and other macros for > CPU states in linux/cpu.h are needed by arch/powerpc/kvm/book3s_hv.c. > Otherwise, build error as below is seen: > > gwshan@gwshan:~/sandbox/l$ make arch/powerpc/kvm/book3s_hv.o > : > CC arch/powerpc/kvm/book3s_hv.o > arch/powerpc/kvm/book3s_hv.c: In function ‘kvmppc_cpu_notify’: > arch/powerpc/kvm/book3s_hv.c:3072:7: error: ‘CPU_UP_PREPARE’ \ > undeclared (first use in this function) > > This fixes the issue introduced by commit <6f3bb80944> ("KVM: PPC: > Book3S HV: kvmppc_host_rm_ops - handle offlining CPUs"). > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > --- I ran into the same thing, fixed it, but forgot to send it out Reviewed-by: Balbir Singh <bsingharora@gmail.com>
On Wed, May 11, 2016 at 11:15:55AM +1000, Gavin Shan wrote: > When CONFIG_KVM_XICS is enabled, CPU_UP_PREPARE and other macros for > CPU states in linux/cpu.h are needed by arch/powerpc/kvm/book3s_hv.c. > Otherwise, build error as below is seen: > > gwshan@gwshan:~/sandbox/l$ make arch/powerpc/kvm/book3s_hv.o > : > CC arch/powerpc/kvm/book3s_hv.o > arch/powerpc/kvm/book3s_hv.c: In function ‘kvmppc_cpu_notify’: > arch/powerpc/kvm/book3s_hv.c:3072:7: error: ‘CPU_UP_PREPARE’ \ > undeclared (first use in this function) > > This fixes the issue introduced by commit <6f3bb80944> ("KVM: PPC: > Book3S HV: kvmppc_host_rm_ops - handle offlining CPUs"). > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Thanks, applied to my kvm-ppc-next branch (with cc: stable@vger.kernel.org). Paul.
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 4cd37b4..e20beae 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -27,6 +27,7 @@ #include <linux/export.h> #include <linux/fs.h> #include <linux/anon_inodes.h> +#include <linux/cpu.h> #include <linux/cpumask.h> #include <linux/spinlock.h> #include <linux/page-flags.h>
When CONFIG_KVM_XICS is enabled, CPU_UP_PREPARE and other macros for CPU states in linux/cpu.h are needed by arch/powerpc/kvm/book3s_hv.c. Otherwise, build error as below is seen: gwshan@gwshan:~/sandbox/l$ make arch/powerpc/kvm/book3s_hv.o : CC arch/powerpc/kvm/book3s_hv.o arch/powerpc/kvm/book3s_hv.c: In function ‘kvmppc_cpu_notify’: arch/powerpc/kvm/book3s_hv.c:3072:7: error: ‘CPU_UP_PREPARE’ \ undeclared (first use in this function) This fixes the issue introduced by commit <6f3bb80944> ("KVM: PPC: Book3S HV: kvmppc_host_rm_ops - handle offlining CPUs"). Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- arch/powerpc/kvm/book3s_hv.c | 1 + 1 file changed, 1 insertion(+)