1 files changed, 4 insertions, 6 deletions

diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 0d40c285bd86..f944836da8a2 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -25,11 +25,6 @@
         ldr     \rd, [\rn, #VMA_VM_FLAGS]
         .endm
 
-        .macro  tsk_mm, rd, rn
-        ldr     \rd, [\rn, #TI_TASK]
-        ldr     \rd, [\rd, #TSK_ACTIVE_MM]
-        .endm
-
 /*
  * act_mm - get current->active_mm
  */
@@ -37,7 +32,10 @@
         bic     \rd, sp, #8128
         bic     \rd, \rd, #63
         ldr     \rd, [\rd, #TI_TASK]
-        ldr     \rd, [\rd, #TSK_ACTIVE_MM]
+        .if (TSK_ACTIVE_MM > IMM12_MASK)
+        add     \rd, \rd, #TSK_ACTIVE_MM & ~IMM12_MASK
+        .endif
+        ldr     \rd, [\rd, #TSK_ACTIVE_MM & IMM12_MASK]
         .endm
 
 /*