summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2022-05-20 20:51:54 +0300
committerCatalin Marinas <catalin.marinas@arm.com>2022-05-20 20:51:54 +0300
commit0616ea3f1b93a99264d84f3d002ae117f6526b62 (patch)
treef805067a257b1e467ffe38bb43b7f8c148a19101 /Documentation
parentd6fc5db0f82828c74742319cb6c988c4a8aac535 (diff)
parent18f3976fdb5da2ba9572845e6f7dfb58652871ea (diff)
downloadlinux-0616ea3f1b93a99264d84f3d002ae117f6526b62.tar.xz
Merge branch 'for-next/esr-elx-64-bit' into for-next/core
* for-next/esr-elx-64-bit: : Treat ESR_ELx as a 64-bit register. KVM: arm64: uapi: Add kvm_debug_exit_arch.hsr_high KVM: arm64: Treat ESR_EL2 as a 64-bit register arm64: Treat ESR_ELx as a 64-bit register arm64: compat: Do not treat syscall number as ESR_ELx for a bad syscall arm64: Make ESR_ELx_xVC_IMM_MASK compatible with assembly
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/virt/kvm/api.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
index 85c7abc51af5..ecd70d99f3e0 100644
--- a/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@ -5713,6 +5713,8 @@ affect the device's behavior. Current defined flags::
#define KVM_RUN_X86_SMM (1 << 0)
/* x86, set if bus lock detected in VM */
#define KVM_RUN_BUS_LOCK (1 << 1)
+ /* arm64, set for KVM_EXIT_DEBUG */
+ #define KVM_DEBUG_ARCH_HSR_HIGH_VALID (1 << 0)
::