Merge c776234803 ("KVM: arm64: Eagerly switch ZCR_EL{1,2}") into android16-6.12

Browse Source

Steps on the way to 6.12.21

Merges "around" the following commits due to the massive merge conflicts
that are involved here:

e6cd28bbbf KVM: arm64: Calculate cptr_el2 traps on activating traps
79e140bba7 KVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state
f19a46cb53 KVM: arm64: Remove host FPSIMD saving for non-protected KVM
d547b363f1 KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN
cb53828d69 KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN
2e4f2c20db KVM: arm64: Refactor exit handlers
4a397bf077 KVM: arm64: Mark some header functions as inline
c776234803 KVM: arm64: Eagerly switch ZCR_EL{1,2}

Bug: 411040189
Cc: Fuad Tabba <tabba@google.com>
Change-Id: I2985c9dad24b6435c9100ac487b1bb2930de3d52
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman

2025-04-24 10:06:46 +00:00

parent 99d39c38c7 c776234803

commit b7144198bc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available