summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-07-28 17:56:30 +0100
committerMark Brown <broonie@kernel.org>2026-07-28 17:56:30 +0100
commit0ad1ec6c9554b8f42c5e75747dbfa77a9652e324 (patch)
treee7c5592df6e7278ec26a9122be1cae4394a42742 /include
parent8fa75df19a47a114df62dfc09a3663972c6ac843 (diff)
parent6010db0e23f52e178e3f6abe248efa4671c602c1 (diff)
downloadlinux-next-0ad1ec6c9554b8f42c5e75747dbfa77a9652e324.tar.gz
linux-next-0ad1ec6c9554b8f42c5e75747dbfa77a9652e324.zip
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
# Conflicts: # arch/arm64/tools/cpucaps
Diffstat (limited to 'include')
-rw-r--r--include/kvm/arm_vgic.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index cefddc9c621d..2f0bc8f4b217 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -176,8 +176,6 @@ struct vgic_global {
/* GICv3 compat mode on a GICv5 host */
bool has_gcie_v3_compat;
- u32 ich_vtr_el2;
-
/* GICv5 PPI capabilities */
struct {
DECLARE_BITMAP(impl_ppi_mask, VGIC_V5_NR_PRIVATE_IRQS);