Skip to content

Commit

Permalink
update to riscv-kernel-6.11.0 v31
Browse files Browse the repository at this point in the history
  • Loading branch information
ZLangJIT committed Oct 16, 2024
1 parent 859e561 commit e0d6ee8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rvvm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5917,7 +5917,7 @@ index 7cbe407..8e5e681 100644
if (rvvm_getarg("dumpdtb")) rvvm_dump_dtb(machine, rvvm_getarg("dumpdtb"));
return true;
diff --git a/src/rvvm.c b/src/rvvm.c
index 71f1dbf..7b19c2c 100644
index 71f1dbf..800e098 100644
--- a/src/rvvm.c
+++ b/src/rvvm.c
@@ -691,16 +691,60 @@ PUBLIC void rvvm_free_machine(rvvm_machine_t* machine)
Expand Down Expand Up @@ -5954,7 +5954,7 @@ index 71f1dbf..7b19c2c 100644
+|-------------|
+ |-------|
+*/
+static inline bool rvvm_mmio_zone_check_overlap(rvvm_machine_t* machine, rvvm_addr_t A_BEGIN, rvvm_addr_t A_END, rvvm_addr_t B_BEGIN, rvvm_addr_t B_END) {
+static inline bool rvvm_mmio_zone_check_overlap(rvvm_addr_t A_BEGIN, rvvm_addr_t A_END, rvvm_addr_t B_BEGIN, rvvm_addr_t B_END) {
+ return
+ (
+ A_BEGIN >= B_BEGIN && ( // handle 1, 3, 5, 6, 7, 8, 9
Expand Down

0 comments on commit e0d6ee8

Please sign in to comment.