Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1287cb3f authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: PPC: Book3S: Move vcore definition to end of kvm_arch struct 



When building KVM with a lot of vcores (NR_CPUS is big), we can potentially
get out of the ld immediate range for dereferences inside that struct.

Move the array to the end of our kvm_arch struct. This fixes compilation
issues with NR_CPUS=2048 for me.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent debf27d6

arch/powerpc/include/asm/kvm_host.h

+4 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ struct kvm_arch { 
	atomic_t hpte_mod_interest;

	spinlock_t slot_phys_lock;

	cpumask_t need_tlb_flush;

	struct kvmppc_vcore *vcores[KVM_MAX_VCORES];

	int hpt_cma_alloc;

#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -273,6 +272,10 @@ struct kvm_arch { 
	struct kvmppc_xics *xics;

#endif

	struct kvmppc_ops *kvm_ops;

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	/* This array can grow quite large, keep it at the end */

	struct kvmppc_vcore *vcores[KVM_MAX_VCORES];

#endif

};



/*