Skip to content

Commit

Permalink
Merge tag 'kvm-riscv-fixes-6.10-2' of https://github.com/kvm-riscv/linux
Browse files Browse the repository at this point in the history
 into HEAD

KVM/riscv fixes for 6.10, take Rust-for-Linux#2

- Fix compilation for KVM selftests
  • Loading branch information
bonzini committed Jun 21, 2024
2 parents dee67a9 + 0fc670d commit e159d63
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions tools/testing/selftests/kvm/lib/riscv/ucall.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include "kvm_util.h"
#include "processor.h"
#include "sbi.h"

void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu)
{
Expand Down
1 change: 1 addition & 0 deletions tools/testing/selftests/kvm/riscv/ebreak_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*
*/
#include "kvm_util.h"
#include "ucall_common.h"

#define LABEL_ADDRESS(v) ((uint64_t)&(v))

Expand Down
1 change: 1 addition & 0 deletions tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "processor.h"
#include "sbi.h"
#include "arch_timer.h"
#include "ucall_common.h"

/* Maximum counters(firmware + hardware) */
#define RISCV_MAX_PMU_COUNTERS 64
Expand Down

0 comments on commit e159d63

Please sign in to comment.