]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge tag 'kvm-riscv-fixes-6.9-1' of https://github.com/kvm-riscv/linux into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 2 Apr 2024 16:29:51 +0000 (12:29 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 2 Apr 2024 16:29:51 +0000 (12:29 -0400)
KVM/riscv fixes for 6.9, take #1

- Fix spelling mistake in arch_timer selftest
- Remove redundant semicolon in num_isa_ext_regs()
- Fix APLIC setipnum_le/be write emulation
- Fix APLIC in_clrip[x] read emulation

1  2 
tools/testing/selftests/kvm/aarch64/arch_timer.c

index 93100b3f1312aa330f2d25edc91ebd3aa41d4399,16ac74d07d6807f4be53eebe189f5c3aae97db5e..4eaba83cdcf3d20f522e4d9a5fec5a65117ccaaf
@@@ -135,8 -135,8 +135,8 @@@ static void guest_run_stage(struct test
  
                irq_iter = READ_ONCE(shared_data->nr_iter);
                __GUEST_ASSERT(config_iter + 1 == irq_iter,
 -                              "config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n"
 +                              "config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"
-                               "  Guest timer interrupt was not trigged within the specified\n"
+                               "  Guest timer interrupt was not triggered within the specified\n"
                                "  interval, try to increase the error margin by [-e] option.\n",
                                config_iter + 1, irq_iter);
        }