If you want to support "DAMON_DBGFS" in config file, it only depends on any one of "DAMON_VADDR" and "DAMON_PADDR", and sometimes we just want to use damon virtual address function, but it is unreasonable to include "DAMON_PADDR" in config file which cause the damon/paddr.c be compiled. So there just do little change to fix it. Signed-off-by: Xin Hao <xhao@xxxxxxxxxxxxxxxxx> --- include/linux/damon.h | 16 ++++++++++++++++ mm/damon/Kconfig | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/linux/damon.h b/include/linux/damon.h index 794b5f453662..c83e4588aa45 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -501,12 +501,28 @@ int damon_stop(struct damon_ctx **ctxs, int nr_ctxs); #ifdef CONFIG_DAMON_VADDR bool damon_va_target_valid(void *t); void damon_va_set_primitives(struct damon_ctx *ctx); +#else +static inline void damon_va_set_primitives(struct damon_ctx *ctx) { } +static inline bool damon_va_target_valid(void *t) +{ + return false; +} #endif /* CONFIG_DAMON_VADDR */ #ifdef CONFIG_DAMON_PADDR bool damon_pa_check(char *buf, size_t count); bool damon_pa_target_valid(void *t); void damon_pa_set_primitives(struct damon_ctx *ctx); +#else +static inline bool damon_pa_check(char *buf, size_t count) +{ + return false; +} +static inline void damon_pa_set_primitives(struct damon_ctx *ctx) { } +static inline bool damon_pa_target_valid(void *t) +{ + return false; +} #endif /* CONFIG_DAMON_PADDR */ #endif /* _DAMON_H */ diff --git a/mm/damon/Kconfig b/mm/damon/Kconfig index 5bcf05851ad0..a8952af3c8bf 100644 --- a/mm/damon/Kconfig +++ b/mm/damon/Kconfig @@ -54,7 +54,7 @@ config DAMON_VADDR_KUNIT_TEST config DAMON_DBGFS bool "DAMON debugfs interface" - depends on DAMON_VADDR && DAMON_PADDR && DEBUG_FS + depends on (DAMON_VADDR || DAMON_PADDR) && DEBUG_FS help This builds the debugfs interface for DAMON. The user space admins can use the interface for arbitrary data access monitoring. -- 2.27.0