commit e4c0c17f68725e4db384515a4d2668fec96ea887
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 13 23:24:25 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 13 23:24:25 2024 +0000
tree 2b6b9a89a09e73e14e1e7bb7012ecd8fa8356f75
parent 90d30eaf162feef105ba3e4c3e9ac62ab370c52f
parent 0ac63fecdffc2d714c8aeb0c5d426716c35a1598

Snap for 12224018 from 0ac63fecdffc2d714c8aeb0c5d426716c35a1598 to 24Q4-release

Change-Id: I4f71a712091b4e0f792633e8a2f40e41587be841

libs/libvmbase/example/src/layout.rs

diff --git a/libs/libvmbase/example/src/layout.rs b/libs/libvmbase/example/src/layout.rs
index 49e4aa7..50ecb7e 100644
--- a/libs/libvmbase/example/src/layout.rs
+++ b/libs/libvmbase/example/src/layout.rs
@@ -17,14 +17,13 @@
 use aarch64_paging::paging::{MemoryRegion, VirtualAddress};
 use core::ops::Range;
 use log::info;
-use vmbase::layout;
+use vmbase::{layout, memory::PAGE_SIZE};
 
 /// The first 1 GiB of memory are used for MMIO.
 pub const DEVICE_REGION: MemoryRegion = MemoryRegion::new(0, 0x40000000);
 
 /// Writable data region for the stack.
 pub fn boot_stack_range() -> Range<VirtualAddress> {
-    const PAGE_SIZE: usize = 4 << 10;
     layout::stack_range(40 * PAGE_SIZE)
 }