diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c index a01bfb48b45..99e442f7242 100644 --- a/fs/procfs/fs_procfsproc.c +++ b/fs/procfs/fs_procfsproc.c @@ -90,7 +90,7 @@ enum proc_node_e #ifdef CONFIG_SCHED_CRITMONITOR PROC_CRITMON, /* Critical section monitor */ #endif -#ifdef CONFIG_DEBUG_MM +#ifdef CONFIG_MM_BACKTRACE PROC_HEAP, /* Task heap info */ #endif PROC_STACK, /* Task stack info */ @@ -279,7 +279,7 @@ static const struct proc_node_s g_critmon = }; #endif -#ifdef CONFIG_DEBUG_MM +#ifdef CONFIG_MM_BACKTRACE static const struct proc_node_s g_heap = { "heap", "heap", (uint8_t)PROC_HEAP, DTYPE_FILE /* Task heap info */ @@ -326,7 +326,7 @@ static FAR const struct proc_node_s * const g_nodeinfo[] = #ifdef CONFIG_SCHED_CRITMONITOR &g_critmon, /* Critical section Monitor */ #endif -#ifdef CONFIG_DEBUG_MM +#ifdef CONFIG_MM_BACKTRACE &g_heap, /* Task heap info */ #endif &g_stack, /* Task stack info */ @@ -352,7 +352,7 @@ static const struct proc_node_s * const g_level0info[] = #ifdef CONFIG_SCHED_CRITMONITOR &g_critmon, /* Critical section monitor */ #endif -#ifdef CONFIG_DEBUG_MM +#ifdef CONFIG_MM_BACKTRACE &g_heap, /* Task heap info */ #endif &g_stack, /* Task stack info */ diff --git a/include/malloc.h b/include/malloc.h index 50345c32336..2f6bfdc5bd8 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -52,7 +52,7 @@ struct mallinfo * by free (not in use) chunks. */ }; -#ifdef CONFIG_DEBUG_MM +#ifdef CONFIG_MM_BACKTRACE struct mallinfo_task { pid_t pid; /* The pid of task */ @@ -72,7 +72,7 @@ extern "C" struct mallinfo mallinfo(void); size_t malloc_size(FAR void *ptr); -#ifdef CONFIG_DEBUG_MM +#ifdef CONFIG_MM_BACKTRACE struct mallinfo_task mallinfo_task(pid_t pid); #endif diff --git a/include/nuttx/fs/procfs.h b/include/nuttx/fs/procfs.h index 8de46ee5e55..b648160094f 100644 --- a/include/nuttx/fs/procfs.h +++ b/include/nuttx/fs/procfs.h @@ -133,7 +133,7 @@ struct procfs_meminfo_entry_s FAR const char *name; FAR struct mm_heap_s *heap; struct procfs_meminfo_entry_s *next; -#if defined(CONFIG_DEBUG_MM) +#if defined(CONFIG_MM_BACKTRACE) /* This is dynamic control flag whether to turn on backtrace in the heap, * you can set it by /proc/memdump. diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c index 4ef51c1433a..68957f217c6 100644 --- a/mm/mm_heap/mm_initialize.c +++ b/mm/mm_heap/mm_initialize.c @@ -220,7 +220,7 @@ FAR struct mm_heap_s *mm_initialize(FAR const char *name, # if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) heap->mm_procfs.name = name; heap->mm_procfs.heap = heap; -# if defined (CONFIG_DEBUG_MM) && defined(CONFIG_MM_BACKTRACE_DEFAULT) +# if defined (CONFIG_MM_BACKTRACE) && defined(CONFIG_MM_BACKTRACE_DEFAULT) heap->mm_procfs.backtrace = true; # endif # endif