Skip to content

Commit

Permalink
Rename PlaceHolder -> Placeholder
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Spinale <[email protected]>
  • Loading branch information
nspin committed Oct 7, 2024
1 parent e634bce commit 2e844c3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions crates/examples/root-task/serial-device/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ fn trim_untyped(
// // //

#[repr(C, align(4096))]
struct FreePagePlaceHolder(#[allow(dead_code)] [u8; GRANULE_SIZE]);
struct FreePagePlaceholder(#[allow(dead_code)] [u8; GRANULE_SIZE]);

static mut FREE_PAGE_PLACEHOLDER: FreePagePlaceHolder = FreePagePlaceHolder([0; GRANULE_SIZE]);
static mut FREE_PAGE_PLACEHOLDER: FreePagePlaceholder = FreePagePlaceholder([0; GRANULE_SIZE]);

fn init_free_page_addr(bootinfo: &sel4::BootInfo) -> usize {
let addr = ptr::addr_of!(FREE_PAGE_PLACEHOLDER) as usize;
Expand Down
4 changes: 2 additions & 2 deletions crates/examples/root-task/spawn-task/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ fn main(bootinfo: &sel4::BootInfoPtr) -> sel4::Result<Never> {
// // //

#[repr(C, align(4096))]
struct FreePagePlaceHolder(#[allow(dead_code)] [u8; GRANULE_SIZE]);
struct FreePagePlaceholder(#[allow(dead_code)] [u8; GRANULE_SIZE]);

static mut FREE_PAGE_PLACEHOLDER: FreePagePlaceHolder = FreePagePlaceHolder([0; GRANULE_SIZE]);
static mut FREE_PAGE_PLACEHOLDER: FreePagePlaceholder = FreePagePlaceholder([0; GRANULE_SIZE]);

fn init_free_page_addr(bootinfo: &sel4::BootInfo) -> usize {
let addr = ptr::addr_of!(FREE_PAGE_PLACEHOLDER) as usize;
Expand Down
6 changes: 3 additions & 3 deletions crates/sel4-capdl-initializer/core/src/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ const SMALL_PAGE_PLACEHOLDER_SIZE: usize = if sel4_cfg_bool!(ARCH_AARCH32) {
#[repr(C)]
#[sel4_cfg_attr(ARCH_AARCH32, repr(align(65536)))]
#[sel4_cfg_attr(not(ARCH_AARCH32), repr(align(4096)))]
struct SmallPagePlaceHolder(#[allow(dead_code)] [u8; SMALL_PAGE_PLACEHOLDER_SIZE]);
struct SmallPagePlaceholder(#[allow(dead_code)] [u8; SMALL_PAGE_PLACEHOLDER_SIZE]);

static SMALL_PAGE_PLACEHOLDER: SmallPagePlaceHolder =
SmallPagePlaceHolder([0; SMALL_PAGE_PLACEHOLDER_SIZE]);
static SMALL_PAGE_PLACEHOLDER: SmallPagePlaceholder =
SmallPagePlaceholder([0; SMALL_PAGE_PLACEHOLDER_SIZE]);

pub(crate) struct CopyAddrs {
smaller_frame_copy_addr: usize,
Expand Down

0 comments on commit 2e844c3

Please sign in to comment.