KVM: x86/mmu: Include mmu.h in spte.h
Sean Christopherson
maintainerPATCH 1/1 KVM: x86/mmu: Include mmu.h in spte.h
Explicitly include mmu.h in spte.h instead of relying on the "parent" to include mmu.h. spte.h references a variety of macros and variables that are defined/declared in mmu.h, and so including spte.h before (or instead of) mmu.h will result in build errors, e.g.
arch/x86/kvm/mmu/spte.h: In function ‘is_mmio_spte’:
arch/x86/kvm/mmu/spte.h:242:23: error: ‘enable_mmio_caching’ undeclared
242 | likely(enable_mmio_caching);
| ^~~~~~~~~~~~~~~~~~~ arch/x86/kvm/mmu/spte.h: In function ‘is_large_pte’:
arch/x86/kvm/mmu/spte.h:302:22: error: ‘PT_PAGE_SIZE_MASK’ undeclared
302 | return pte & PT_PAGE_SIZE_MASK;
| ^~~~~~~~~~~~~~~~~ arch/x86/kvm/mmu/spte.h: In function ‘is_dirty_spte’:
arch/x86/kvm/mmu/spte.h:332:56: error: ‘PT_WRITABLE_MASK’ undeclared
332 | return dirty_mask ? spte & dirty_mask : spte & PT_WRITABLE_MASK;
| ^~~~~~~~~~~~~~~~--- arch/x86/kvm/mmu/spte.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/kvm/mmu/spte.h +1 -0
@@ -3,6 +3,7 @@#ifndef KVM_X86_MMU_SPTE_H #define KVM_X86_MMU_SPTE_H +#include "mmu.h" #include "mmu_internal.h" /*
base-commit: 240f736891887939571854bd6d734b6c9291f22e
Signature · 1 line
2.41.0.640.ga95def55d0-goog
Quoted 11 lines · Sean Christopherson
Explicitly include
mmu.hinspte.hinstead of relying on the "parent" to includemmu.h.spte.hreferences a variety of macros and variables that are defined/declared inmmu.h, and so includingspte.hbefore (or instead of)mmu.hwill result in build errors, e.g.
arch/x86/kvm/mmu/spte.h: In function ‘is_mmio_spte’:
arch/x86/kvm/mmu/spte.h:242:23: error: ‘enable_mmio_caching’ undeclared242 | likely(enable_mmio_caching); | ^~~~~~~~~~~~~~~~~~~[...]
Applied to kvm-x86 mmu, thanks!
[1/1] KVM: x86/mmu: Include mmu.h in spte.h
https://github.com/kvm-x86/linux/commit/bfd926291c58
--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes