From 41d62033a061e798c08945fa4a458ddb24387d2e Mon Sep 17 00:00:00 2001 From: Masayuki Ishikawa Date: Thu, 17 Feb 2022 15:52:25 +0900 Subject: [PATCH] mm: umm_heap: Fix umm_heap for BUILD_KERNEL & ADDRENV Summary: - I noticed that the user heap is corrupted - This commit fixes this issue by reverting the change to the NuttX-9.0.0 Impact: - None Testing: - sabre6-quad:netknsh (not merged yet) Signed-off-by: Masayuki Ishikawa Co-authored-by: Oki Minabe --- mm/umm_heap/umm_heap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/umm_heap/umm_heap.h b/mm/umm_heap/umm_heap.h index 7d8e8a49da..7d74ea94e1 100644 --- a/mm/umm_heap/umm_heap.h +++ b/mm/umm_heap/umm_heap.h @@ -35,7 +35,7 @@ * Pre-processor Definitions ****************************************************************************/ -#if defined(CONFIG_ARCH_ADDRENV) && defined(__KERNEL__) +#if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL) /* In the kernel build, there are multiple user heaps; one for each task * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address