diff --git a/Cargo.lock b/Cargo.lock index 3e8f62a36a..81cdc8c2c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,6 +23,12 @@ dependencies = [ [[package]] name = "allocator" version = "0.1.0" +source = "git+https://github.com/arceos-org/allocator.git?tag=v0.1.0#16496d88dd6fc6a0bdfa59aedfb6b349bd88ee88" + +[[package]] +name = "allocator" +version = "0.1.1" +source = "git+https://github.com/arceos-org/allocator.git?tag=v0.1.1#1d5b7a1b4fd8db4c9c9cea4e6012d15d42e2bf40" dependencies = [ "bitmap-allocator", "buddy_system_allocator", @@ -31,11 +37,6 @@ dependencies = [ "slab_allocator", ] -[[package]] -name = "allocator" -version = "0.1.0" -source = "git+https://github.com/arceos-org/allocator.git?tag=v0.1.0#16496d88dd6fc6a0bdfa59aedfb6b349bd88ee88" - [[package]] name = "android-tzdata" version = "0.1.1" @@ -172,7 +173,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" name = "axalloc" version = "0.1.0" dependencies = [ - "allocator 0.1.0", + "allocator 0.1.1", "axerrno", "cfg-if", "kspin", @@ -203,7 +204,7 @@ dependencies = [ name = "axdma" version = "0.1.0" dependencies = [ - "allocator 0.1.0 (git+https://github.com/arceos-org/allocator.git?tag=v0.1.0)", + "allocator 0.1.0", "axalloc", "axconfig", "axerrno", diff --git a/modules/axalloc/Cargo.toml b/modules/axalloc/Cargo.toml index 7710b13535..d823d2f935 100644 --- a/modules/axalloc/Cargo.toml +++ b/modules/axalloc/Cargo.toml @@ -21,4 +21,4 @@ cfg-if = "1.0" kspin = "0.1" memory_addr = "0.3" axerrno = "0.1" -allocator = { path = "../../../arceos-crates/allocator", features = ["bitmap", "page-alloc-64g"] } +allocator = { git = "https://github.com/arceos-org/allocator.git", tag = "v0.1.1", features = ["bitmap", "page-alloc-64g"] }