diff options
| author | Marc Zyngier <[email protected]> | 2021-12-07 09:14:53 +0000 |
|---|---|---|
| committer | Marc Zyngier <[email protected]> | 2021-12-07 09:14:53 +0000 |
| commit | 94b4a6d52173521b63b11516fe963d651dc520a4 (patch) | |
| tree | 857ba45ac7bfdfd80653958048205192b7668196 /include/linux | |
| parent | 370a17f531f1736b7f17d9ac3fb8ef1013d956fd (diff) | |
| parent | f0e6e6fa41b3d2aa1dcb61dd4ed6d7be004bb5a8 (diff) | |
Merge branch kvm-arm64/misc-5.17 into kvmarm-master/next
* kvm-arm64/misc-5.17:
: .
: - Add minimal support for ARMv8.7's PMU extension
: - Constify kvm_io_gic_ops
: - Drop kvm_is_transparent_hugepage() prototype
: .
KVM: Drop stale kvm_is_transparent_hugepage() declaration
KVM: arm64: Constify kvm_io_gic_ops
KVM: arm64: Add minimal handling for the ARMv8.7 PMU
Signed-off-by: Marc Zyngier <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kvm_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index c310648cc8f1..6d138adc78af 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1174,7 +1174,6 @@ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu); bool kvm_is_reserved_pfn(kvm_pfn_t pfn); bool kvm_is_zone_device_pfn(kvm_pfn_t pfn); -bool kvm_is_transparent_hugepage(kvm_pfn_t pfn); struct kvm_irq_ack_notifier { struct hlist_node link; |