On Mon, Jun 18, 2012 at 9:08 AM, Avi Kivity <avi at redhat.com> wrote: > On 06/15/2012 10:07 PM, Christoffer Dall wrote: >> From: Marc Zyngier <marc.zyngier at arm.com> >> >> In order to avoid compilation failure when KVM is not compiled in, >> guard the mmu_notifier specific sections with both CONFIG_MMU_NOTIFIER >> and KVM_ARCH_WANT_MMU_NOTIFIER, like it is being done in the rest of >> the KVM code. >> >> >> -#ifdef KVM_ARCH_WANT_MMU_NOTIFIER >> +#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) >> ? ? ? struct mmu_notifier mmu_notifier; >> ? ? ? unsigned long mmu_notifier_seq; >> ? ? ? long mmu_notifier_count; >> @@ -780,7 +780,7 @@ struct kvm_stats_debugfs_item { >> ?extern struct kvm_stats_debugfs_item debugfs_entries[]; >> ?extern struct dentry *kvm_debugfs_dir; >> >> -#ifdef KVM_ARCH_WANT_MMU_NOTIFIER >> +#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) >> ?static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_seq) >> ?{ > > Why not have Kconfig select CONFIG_MMU_NOTIFIER? > > Not sure I understand. Where would you select this option? We do select this option when choosing to compile KVM on, but when we do _not_, then other includes of kvm_host.h fails. -Christoffer