diff --git a/mm/kasan/kasan.h b/include/nuttx/mm/kasan.h similarity index 96% rename from mm/kasan/kasan.h rename to include/nuttx/mm/kasan.h index 42e0d9d986..6cea24d4f7 100644 --- a/mm/kasan/kasan.h +++ b/include/nuttx/mm/kasan.h @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kasan/kasan.h + * include/nuttx/mm/kasan.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __MM_KASAN_KASAN_H -#define __MM_KASAN_KASAN_H +#ifndef __INCLUDE_NUTTX_MM_KASAN_H +#define __INCLUDE_NUTTX_MM_KASAN_H /**************************************************************************** * Included Files @@ -150,4 +150,4 @@ void kasan_init_early(void); #endif /* CONFIG_MM_KASAN */ -#endif /* __MM_KASAN_KASAN_H */ +#endif /* __INCLUDE_NUTTX_MM_KASAN_H */ diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index 2916a091de..a300e66eb5 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -24,13 +24,12 @@ * Included Files ****************************************************************************/ +#include #include #include #include -#include "kasan.h" - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ diff --git a/mm/kasan/hook.c b/mm/kasan/hook.c index c8039402c9..db1c792f8f 100644 --- a/mm/kasan/hook.c +++ b/mm/kasan/hook.c @@ -22,6 +22,7 @@ * Included Files ****************************************************************************/ +#include #include #include @@ -30,8 +31,6 @@ #include #include -#include "kasan.h" - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/mm/mempool/mempool.c b/mm/mempool/mempool.c index b2fd17107c..1251d46aa5 100644 --- a/mm/mempool/mempool.c +++ b/mm/mempool/mempool.c @@ -31,11 +31,10 @@ #include #include +#include #include #include -#include "kasan/kasan.h" - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ diff --git a/mm/mm_heap/mm_free.c b/mm/mm_heap/mm_free.c index 1f638120b0..ab3cda0eae 100644 --- a/mm/mm_heap/mm_free.c +++ b/mm/mm_heap/mm_free.c @@ -32,9 +32,9 @@ #include #include #include +#include #include "mm_heap/mm.h" -#include "kasan/kasan.h" /**************************************************************************** * Private Functions diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c index 0efff5cb50..ef2329dc0d 100644 --- a/mm/mm_heap/mm_initialize.c +++ b/mm/mm_heap/mm_initialize.c @@ -31,9 +31,9 @@ #include #include +#include #include "mm_heap/mm.h" -#include "kasan/kasan.h" /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c index 8813fecac2..0f81081d11 100644 --- a/mm/mm_heap/mm_malloc.c +++ b/mm/mm_heap/mm_malloc.c @@ -32,10 +32,10 @@ #include #include +#include #include #include "mm_heap/mm.h" -#include "kasan/kasan.h" /**************************************************************************** * Private Functions diff --git a/mm/mm_heap/mm_memalign.c b/mm/mm_heap/mm_memalign.c index 8eaeca2958..218ce4e6f5 100644 --- a/mm/mm_heap/mm_memalign.c +++ b/mm/mm_heap/mm_memalign.c @@ -29,9 +29,9 @@ #include #include +#include #include "mm_heap/mm.h" -#include "kasan/kasan.h" /**************************************************************************** * Public Functions diff --git a/mm/mm_heap/mm_realloc.c b/mm/mm_heap/mm_realloc.c index c8f52a2934..d18d910a3d 100644 --- a/mm/mm_heap/mm_realloc.c +++ b/mm/mm_heap/mm_realloc.c @@ -33,9 +33,9 @@ #include #include +#include #include "mm_heap/mm.h" -#include "kasan/kasan.h" /**************************************************************************** * Public Functions diff --git a/mm/tlsf/mm_tlsf.c b/mm/tlsf/mm_tlsf.c index 48aade6a5b..b8056c0a86 100644 --- a/mm/tlsf/mm_tlsf.c +++ b/mm/tlsf/mm_tlsf.c @@ -40,11 +40,10 @@ #include #include #include -#include +#include #include #include "tlsf/tlsf.h" -#include "kasan/kasan.h" /**************************************************************************** * Pre-processor Definitions