On Thu, 9 Jul 2020 14:28:49 -0400
Paolo Bonzini wrote:
> 5.8-rc1 inadvertently broke userspace ABI compatibility. Merge
> again with latest kvm/master to undo that.
Ouch.
>
> Signed-off-by: Paolo Bonzini
> ---
> The patch should get to Linus tomorrow. Posting here to
> ensure it is on people's radar for hard freeze, because
> I probably won't be around.
Looks good to me. We will probably be able to fill in the proper
hash/rc-reference after the weekend and get this merged. This looks
entirely appropriate even for freeze.
Acked-by: Cornelia Huck
>
> linux-headers/asm-arm/unistd-common.h | 1 +
> linux-headers/asm-x86/kvm.h | 5 +++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/linux-headers/asm-arm/unistd-common.h
> b/linux-headers/asm-arm/unistd-common.h
> index 23de64e44c..57cd1f21db 100644
> --- a/linux-headers/asm-arm/unistd-common.h
> +++ b/linux-headers/asm-arm/unistd-common.h
> @@ -392,5 +392,6 @@
> #define __NR_clone3 (__NR_SYSCALL_BASE + 435)
> #define __NR_openat2 (__NR_SYSCALL_BASE + 437)
> #define __NR_pidfd_getfd (__NR_SYSCALL_BASE + 438)
> +#define __NR_faccessat2 (__NR_SYSCALL_BASE + 439)
>
> #endif /* _ASM_ARM_UNISTD_COMMON_H */
> diff --git a/linux-headers/asm-x86/kvm.h b/linux-headers/asm-x86/kvm.h
> index 17c5a038f4..0780f97c18 100644
> --- a/linux-headers/asm-x86/kvm.h
> +++ b/linux-headers/asm-x86/kvm.h
> @@ -408,14 +408,15 @@ struct kvm_vmx_nested_state_data {
> };
>
> struct kvm_vmx_nested_state_hdr {
> - __u32 flags;
> __u64 vmxon_pa;
> __u64 vmcs12_pa;
> - __u64 preemption_timer_deadline;
>
> struct {
> __u16 flags;
> } smm;
> +
> + __u32 flags;
> + __u64 preemption_timer_deadline;
> };
>
> struct kvm_svm_nested_state_data {
