From 84041a3154c7f33f71040c4272b3194523fcd764 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Tue, 28 Jul 2020 12:20:25 +0800 Subject: [PATCH] libsupport_zynq/ram: use core0 allocator by default. --- libsupport_zynq/src/ram.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libsupport_zynq/src/ram.rs b/libsupport_zynq/src/ram.rs index d21747a..a7134b1 100644 --- a/libsupport_zynq/src/ram.rs +++ b/libsupport_zynq/src/ram.rs @@ -19,7 +19,7 @@ unsafe impl Sync for CortexA9Alloc {} unsafe impl GlobalAlloc for CortexA9Alloc { unsafe fn alloc(&self, layout: Layout) -> *mut u8 { - if MPIDR.read().cpu_id() == 0 { + if cfg!(not(feature = "alloc_core")) || MPIDR.read().cpu_id() == 0 { self.0.get().as_mut() } else { self.1.get().as_mut() @@ -31,7 +31,7 @@ unsafe impl GlobalAlloc for CortexA9Alloc { } unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) { - if MPIDR.read().cpu_id() == 0 { + if cfg!(not(feature = "alloc_core")) || MPIDR.read().cpu_id() == 0 { self.0.get().as_mut() } else { self.1.get().as_mut() @@ -83,7 +83,7 @@ pub fn init_alloc_core1() { fn alloc_error(layout: core::alloc::Layout) -> ! { let id = MPIDR.read().cpu_id(); let heap = unsafe { - if id == 0 { + if cfg!(not(feature = "alloc_core")) || id == 0 { ALLOCATOR.0.get() } else { ALLOCATOR.1.get()