Skip to content

Commit 57cfcdc

Browse files
committed
Remove double map check
1 parent ba7816c commit 57cfcdc

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

src/audio/module_adapter/library/userspace_proxy.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ static int userspace_proxy_memory_init(struct userspace_context *user_ctx,
297297
tr_err(&userspace_proxy_tr, "Heap partition %#lx + %zx, attr = %u",
298298
heap_part.start, heap_part.size, heap_part.attr);
299299

300-
#if !defined(CONFIG_XTENSA_MMU_DOUBLE_MAP) && defined(CONFIG_SOF_ZEPHYR_HEAP_CACHED)
301-
#define HEAP_PART_CACHED
300+
#if defined(CONFIG_SOF_ZEPHYR_HEAP_CACHED)
302301
/* Add cached module private heap to memory partitions */
303302
struct k_mem_partition heap_cached_part = {
304303
.attr = K_MEM_PARTITION_P_RW_U_RW | XTENSA_MMU_CACHED_WB
@@ -317,7 +316,7 @@ static int userspace_proxy_memory_init(struct userspace_context *user_ctx,
317316
* These include ops structures marked with APP_TASK_DATA.
318317
*/
319318
&common_partition,
320-
#ifdef HEAP_PART_CACHED
319+
#ifdef CONFIG_SOF_ZEPHYR_HEAP_CACHED
321320
&heap_cached_part,
322321
#endif
323322
&heap_part

zephyr/lib/userspace_helper.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <sof/lib/dai.h>
2424
#include <sof/lib/dma.h>
2525

26-
#define MODULE_DRIVER_HEAP_CACHED CONFIG_SOF_ZEPHYR_HEAP_CACHED
27-
2826
/* Zephyr includes */
2927
#include <zephyr/kernel.h>
3028
#include <zephyr/app_memory/app_memdomain.h>

0 commit comments

Comments
 (0)