Skip to content

Commit b2124ce

Browse files
committed
[fix] axdma compile error due to incompatible version of allocator
1 parent 4442278 commit b2124ce

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

Cargo.lock

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,7 @@ axsync = { path = "modules/axsync" }
6262
axtask = { path = "modules/axtask" }
6363
axdma = { path = "modules/axdma" }
6464

65+
allocator = { git = "https://github.com/arceos-org/allocator.git", tag = "v0.1.1" }
66+
6567
[profile.release]
6668
lto = true

modules/axalloc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ cfg-if = "1.0"
2121
kspin = "0.1"
2222
memory_addr = "0.3"
2323
axerrno = "0.1"
24-
allocator = { git = "https://github.com/arceos-org/allocator.git", tag = "v0.1.1", features = ["bitmap", "page-alloc-64g"] }
24+
allocator = { workspace = true, features = ["bitmap", "page-alloc-64g"] }

modules/axdma/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ log = "=0.4.21"
1515
kspin = "0.1"
1616
memory_addr = "0.3"
1717
axerrno = "0.1"
18-
allocator = { git = "https://github.com/arceos-org/allocator.git", tag = "v0.1.0" }
18+
allocator = { workspace = true }
1919
axalloc = { workspace = true }
2020
axmm = { workspace = true }
2121
axconfig = { workspace = true }

0 commit comments

Comments
 (0)