Am 13.03.2012 um 21:09 schrieb Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>: > On Tue, 2012-03-13 at 14:47 +0100, Alexander Graf wrote: > >>> +++ b/arch/powerpc/include/asm/kvm_host.h >>> @@ -183,10 +183,14 @@ struct kvm_arch { >>> unsigned long lpcr; >>> unsigned long rmor; >>> struct kvmppc_rma_info *rma; >>> - struct list_head spapr_tce_tables; >>> unsigned short last_vcpu[NR_CPUS]; >>> struct kvmppc_vcore *vcores[KVM_MAX_VCORES]; >>> + struct list_head spapr_tce_tables; >>> #endif /* CONFIG_KVM_BOOK3S_64_HV */ >>> + >>> +#ifdef CONFIG_KVM_BOOK3S_64_PR >>> + struct list_head spapr_tce_tables; >>> +#endif /* CONFIG_KVM_BOOK3S_64_PR */ >> >> Please move the definition to an #ifdef on CONFIG_KVM_BOOK3S_64. That way we get rid of the duplication here. > > I did that initially but that doesn't work when it's a module, as > CONFIG_KVM_BOOK3S_64 is "m" in Kconfig and thus not defined as such > but CONFIG_KVM_BOOK3S_64_MODULE is) > > Maybe we should change the way our Kconfig is organized but I din't > feel like doing so yesterday :-) So how about making it unconditional? Or just depend on book3s_64? Alex -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html