tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

KVM: arm64: Shuffle KVM_HOST_DATA_FLAG_* indices

There's a gap in the KVM_HOST_DATA_FLAG_* indices since the removal of
KVM_HOST_DATA_FLAG_HOST_SVE_ENABLED and
KVM_HOST_DATA_FLAG_HOST_SME_ENABLED in commits:

* 459f059be702 ("KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN")
* 407a99c4654e ("KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN")

Shuffle the indices to remove the gap, as Oliver requested at the time of
the removals:

https://lore.kernel.org/linux-arm-kernel/Z6qC4qn47ONfDCSH@linux.dev/

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Fuad Tabba <tabba@google.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Will Deacon <will@kernel.org>
Tested-by: Fuad Tabba <tabba@google.com>
Reviewed-by: Fuad Tabba <tabba@google.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://patch.msgid.link/20260106173707.3292074-3-mark.rutland@arm.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

authored by

Mark Rutland and committed by
Marc Zyngier acd8bfaa 334a1a1e

+5 -5
+5 -5
arch/arm64/include/asm/kvm_host.h
··· 710 710 struct kvm_host_data { 711 711 #define KVM_HOST_DATA_FLAG_HAS_SPE 0 712 712 #define KVM_HOST_DATA_FLAG_HAS_TRBE 1 713 - #define KVM_HOST_DATA_FLAG_TRBE_ENABLED 4 714 - #define KVM_HOST_DATA_FLAG_EL1_TRACING_CONFIGURED 5 715 - #define KVM_HOST_DATA_FLAG_VCPU_IN_HYP_CONTEXT 6 716 - #define KVM_HOST_DATA_FLAG_L1_VNCR_MAPPED 7 717 - #define KVM_HOST_DATA_FLAG_HAS_BRBE 8 713 + #define KVM_HOST_DATA_FLAG_TRBE_ENABLED 2 714 + #define KVM_HOST_DATA_FLAG_EL1_TRACING_CONFIGURED 3 715 + #define KVM_HOST_DATA_FLAG_VCPU_IN_HYP_CONTEXT 4 716 + #define KVM_HOST_DATA_FLAG_L1_VNCR_MAPPED 5 717 + #define KVM_HOST_DATA_FLAG_HAS_BRBE 6 718 718 unsigned long flags; 719 719 720 720 struct kvm_cpu_context host_ctxt;