On Tue, May 25, 2021, Shaokun Zhang wrote: > Function 'is_nx_huge_page_enabled' is declared twice, remove the > repeated declaration. > > Cc: Ben Gardon <bgardon@xxxxxxxxxx> > Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx> > Signed-off-by: Shaokun Zhang <zhangshaokun@xxxxxxxxxxxxx> > --- > arch/x86/kvm/mmu/mmu_internal.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h > index d64ccb417c60..54c6e6193ff2 100644 > --- a/arch/x86/kvm/mmu/mmu_internal.h > +++ b/arch/x86/kvm/mmu/mmu_internal.h > @@ -158,8 +158,6 @@ int kvm_mmu_hugepage_adjust(struct kvm_vcpu *vcpu, gfn_t gfn, > void disallowed_hugepage_adjust(u64 spte, gfn_t gfn, int cur_level, > kvm_pfn_t *pfnp, int *goal_levelp); > > -bool is_nx_huge_page_enabled(void); Rather than simply delete the extra declaration, what about converting this to static inline and opportunistically deleting the duplicate? The implementation is a single operation and this is MMU-internal, i.e. there's no need to export and limited exposure of nx_huge_pages to other code. > - > void *mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc); > > void account_huge_nx_page(struct kvm *kvm, struct kvm_mmu_page *sp); > -- > 2.7.4 >
