diff options
author | 2022-02-21 11:53:51 +0100 | |
---|---|---|
committer | 2022-02-21 11:53:51 +0100 | |
commit | 6255b48aebfd4dff375e97fc8b075a235848db0b (patch) | |
tree | bcedf2b959a843a18cf7ebcc9120a0dd1c4e234f /arch/x86/kvm/vmx/vmcs12.c | |
parent | arm64: Support PREEMPT_DYNAMIC (diff) | |
parent | Linux 5.17-rc5 (diff) | |
download | linux-dev-6255b48aebfd4dff375e97fc8b075a235848db0b.tar.xz linux-dev-6255b48aebfd4dff375e97fc8b075a235848db0b.zip |
Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts
New conflicts in sched/core due to the following upstream fixes:
44585f7bc0cb ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")
a06247c6804f ("psi: Fix uaf issue when psi trigger is destroyed while being polled")
Conflicts:
include/linux/psi_types.h
kernel/sched/psi.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/vmx/vmcs12.c')
-rw-r--r-- | arch/x86/kvm/vmx/vmcs12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx/vmcs12.c b/arch/x86/kvm/vmx/vmcs12.c index cab6ba7a5005..2251b60920f8 100644 --- a/arch/x86/kvm/vmx/vmcs12.c +++ b/arch/x86/kvm/vmx/vmcs12.c @@ -8,7 +8,7 @@ FIELD(number, name), \ [ROL16(number##_HIGH, 6)] = VMCS12_OFFSET(name) + sizeof(u32) -const unsigned short vmcs_field_to_offset_table[] = { +const unsigned short vmcs12_field_offsets[] = { FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id), FIELD(POSTED_INTR_NV, posted_intr_nv), FIELD(GUEST_ES_SELECTOR, guest_es_selector), @@ -151,4 +151,4 @@ const unsigned short vmcs_field_to_offset_table[] = { FIELD(HOST_RSP, host_rsp), FIELD(HOST_RIP, host_rip), }; -const unsigned int nr_vmcs12_fields = ARRAY_SIZE(vmcs_field_to_offset_table); +const unsigned int nr_vmcs12_fields = ARRAY_SIZE(vmcs12_field_offsets); |