diff --git a/arch/arm/core/cortex_m/mpu/arm_core_mpu.c b/arch/arm/core/cortex_m/mpu/arm_core_mpu.c index 4a380a794675c..670eed0e83855 100644 --- a/arch/arm/core/cortex_m/mpu/arm_core_mpu.c +++ b/arch/arm/core/cortex_m/mpu/arm_core_mpu.c @@ -9,7 +9,7 @@ #include #include -#include +#include "arm_core_mpu_dev.h" #include #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL diff --git a/include/arch/arm/cortex_m/mpu/arm_core_mpu_dev.h b/arch/arm/core/cortex_m/mpu/arm_core_mpu_dev.h similarity index 98% rename from include/arch/arm/cortex_m/mpu/arm_core_mpu_dev.h rename to arch/arm/core/cortex_m/mpu/arm_core_mpu_dev.h index 0f813592fb83d..d55a06a9366ed 100644 --- a/include/arch/arm/cortex_m/mpu/arm_core_mpu_dev.h +++ b/arch/arm/core/cortex_m/mpu/arm_core_mpu_dev.h @@ -106,16 +106,6 @@ struct k_thread; * ARM_MPU support. */ -/** - * @brief enable the MPU - */ -void arm_core_mpu_enable(void); - -/** - * @brief disable the MPU - */ -void arm_core_mpu_disable(void); - /** * @brief configure a set of fixed (static) MPU regions * diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu.c b/arch/arm/core/cortex_m/mpu/arm_mpu.c index 6ace1d66bcc82..b847450f7f656 100644 --- a/arch/arm/core/cortex_m/mpu/arm_mpu.c +++ b/arch/arm/core/cortex_m/mpu/arm_mpu.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include "arm_core_mpu_dev.h" #include #include diff --git a/arch/arm/core/cortex_m/mpu/nxp_mpu.c b/arch/arm/core/cortex_m/mpu/nxp_mpu.c index e26c7de45604a..cb6bbf54c5082 100644 --- a/arch/arm/core/cortex_m/mpu/nxp_mpu.c +++ b/arch/arm/core/cortex_m/mpu/nxp_mpu.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include "arm_core_mpu_dev.h" #include #include #include diff --git a/tests/kernel/mem_protect/userspace/src/main.c b/tests/kernel/mem_protect/userspace/src/main.c index 3a7a312c38ca9..cd4d53618dc79 100644 --- a/tests/kernel/mem_protect/userspace/src/main.c +++ b/tests/kernel/mem_protect/userspace/src/main.c @@ -23,7 +23,7 @@ #endif #if defined(CONFIG_ARM) -#include +extern void arm_core_mpu_disable(void); #endif #define INFO(fmt, ...) printk(fmt, ##__VA_ARGS__)