diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2020-10-21 18:05:58 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-21 18:05:58 -0400 |
| commit | c0623f5e5d21d65d08f6276ca4e64d470c833761 (patch) | |
| tree | 5bc1f615341a08b0d2bd9af5a893ae65f8499f05 /tools | |
| parent | KVM: PPC: Book3S HV: Make struct kernel_param_ops definition const (diff) | |
| parent | Merge tag 'kvmarm-fixes-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master (diff) | |
| download | linux-dev-c0623f5e5d21d65d08f6276ca4e64d470c833761.tar.xz linux-dev-c0623f5e5d21d65d08f6276ca4e64d470c833761.zip | |
Merge branch 'kvm-fixes' into 'next'
Pick up bugfixes from 5.9, otherwise various tests fail.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/kvm/x86_64/debug_regs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/x86_64/debug_regs.c b/tools/testing/selftests/kvm/x86_64/debug_regs.c index b8d14f9db5f9..2fc6b3af81a1 100644 --- a/tools/testing/selftests/kvm/x86_64/debug_regs.c +++ b/tools/testing/selftests/kvm/x86_64/debug_regs.c @@ -73,7 +73,7 @@ int main(void) int i; /* Instruction lengths starting at ss_start */ int ss_size[4] = { - 3, /* xor */ + 2, /* xor */ 2, /* cpuid */ 5, /* mov */ 2, /* rdmsr */ |