diff --git a/arch/arm/src/kinetis/kinetis_allocateheap.c b/arch/arm/src/kinetis/kinetis_allocateheap.c
index 43e47725b6a..ab58efa4a8c 100644
--- a/arch/arm/src/kinetis/kinetis_allocateheap.c
+++ b/arch/arm/src/kinetis/kinetis_allocateheap.c
@@ -123,7 +123,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -137,7 +137,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   kinetis_mpu_uheap((uintptr_t)ubase, usize);
+   kinetis_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -177,7 +177,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/lc823450/lc823450_allocateheap2.c b/arch/arm/src/lc823450/lc823450_allocateheap2.c
index ffc43d5ccc7..02abdd4458a 100644
--- a/arch/arm/src/lc823450/lc823450_allocateheap2.c
+++ b/arch/arm/src/lc823450/lc823450_allocateheap2.c
@@ -143,7 +143,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -160,7 +160,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   lc823450_mpu_uheap((uintptr_t)ubase, usize);
+   lc823450_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -203,7 +203,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/lpc17xx/lpc17_allocateheap.c b/arch/arm/src/lpc17xx/lpc17_allocateheap.c
index f739ca3b3bc..36198f65e03 100644
--- a/arch/arm/src/lpc17xx/lpc17_allocateheap.c
+++ b/arch/arm/src/lpc17xx/lpc17_allocateheap.c
@@ -233,7 +233,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -247,7 +247,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   lpc17_mpu_uheap((uintptr_t)ubase, usize);
+   lpc17_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -287,7 +287,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
index cb0165246dd..4594a04cdea 100644
--- a/arch/arm/src/lpc43xx/lpc43_allocateheap.c
+++ b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
@@ -436,7 +436,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -454,7 +454,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-  lpc43_mpu_uheap((uintptr_t)ubase, usize);
+  lpc43_mpu_uheap(ubase, usize);
 
 #else
   /* Return the heap settings */
@@ -503,7 +503,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/sam34/sam_allocateheap.c b/arch/arm/src/sam34/sam_allocateheap.c
index 3e1d5e6efe9..2211d715cb7 100644
--- a/arch/arm/src/sam34/sam_allocateheap.c
+++ b/arch/arm/src/sam34/sam_allocateheap.c
@@ -222,7 +222,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -236,7 +236,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   sam_mpu_uheap((uintptr_t)ubase, usize);
+   sam_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -276,7 +276,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/samv7/sam_allocateheap.c b/arch/arm/src/samv7/sam_allocateheap.c
index 1e8dc087963..8355d237262 100644
--- a/arch/arm/src/samv7/sam_allocateheap.c
+++ b/arch/arm/src/samv7/sam_allocateheap.c
@@ -229,7 +229,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -243,7 +243,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   sam_mpu_uheap((uintptr_t)ubase, usize);
+   sam_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -283,7 +283,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/stm32/stm32_allocateheap.c b/arch/arm/src/stm32/stm32_allocateheap.c
index da11ec0d184..945e4faffb0 100644
--- a/arch/arm/src/stm32/stm32_allocateheap.c
+++ b/arch/arm/src/stm32/stm32_allocateheap.c
@@ -579,7 +579,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -597,7 +597,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   stm32_mpu_uheap((uintptr_t)ubase, usize);
+   stm32_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -641,7 +641,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/stm32f7/stm32_allocateheap.c b/arch/arm/src/stm32f7/stm32_allocateheap.c
index afc23bbe0d0..72c2ba9e3e4 100644
--- a/arch/arm/src/stm32f7/stm32_allocateheap.c
+++ b/arch/arm/src/stm32f7/stm32_allocateheap.c
@@ -292,7 +292,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -310,7 +310,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   stm32_mpu_uheap((uintptr_t)ubase, usize);
+   stm32_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -354,7 +354,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/stm32h7/stm32_allocateheap.c b/arch/arm/src/stm32h7/stm32_allocateheap.c
index c0b924f89f4..e1bbfa2c637 100644
--- a/arch/arm/src/stm32h7/stm32_allocateheap.c
+++ b/arch/arm/src/stm32h7/stm32_allocateheap.c
@@ -213,7 +213,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -231,7 +231,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   stm32_mpu_uheap((uintptr_t)ubase, usize);
+   stm32_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -275,7 +275,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/stm32l4/stm32l4_allocateheap.c b/arch/arm/src/stm32l4/stm32l4_allocateheap.c
index 2df8d8c571e..f265e8edf79 100644
--- a/arch/arm/src/stm32l4/stm32l4_allocateheap.c
+++ b/arch/arm/src/stm32l4/stm32l4_allocateheap.c
@@ -241,7 +241,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -259,7 +259,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   stm32l4_mpu_uheap((uintptr_t)ubase, usize);
+   stm32l4_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -303,7 +303,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((SRAM1_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/tiva/tiva_allocateheap.c b/arch/arm/src/tiva/tiva_allocateheap.c
index 06df87bb31b..200f92331c6 100644
--- a/arch/arm/src/tiva/tiva_allocateheap.c
+++ b/arch/arm/src/tiva/tiva_allocateheap.c
@@ -123,7 +123,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -137,7 +137,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   tiva_mpu_uheap((uintptr_t)ubase, usize);
+   tiva_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -177,7 +177,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
diff --git a/arch/arm/src/xmc4/xmc4_allocateheap.c b/arch/arm/src/xmc4/xmc4_allocateheap.c
index 37ae505466a..5ac8b0357ab 100644
--- a/arch/arm/src/xmc4/xmc4_allocateheap.c
+++ b/arch/arm/src/xmc4/xmc4_allocateheap.c
@@ -111,7 +111,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);
@@ -125,7 +125,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   xmc4_mpu_uheap((uintptr_t)ubase, usize);
+   xmc4_mpu_uheap(ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -165,7 +165,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
    * is aligned to the MPU requirement.
    */
 
-  log2  = (int)mpu_log2regionfloor(usize);
+  log2  = (int)mpu_log2regionfloor(ubase, usize);
   DEBUGASSERT((CONFIG_RAM_END & ((1 << log2) - 1)) == 0);
 
   usize = (1 << log2);