diff options
| author | Kees Cook <keescook@chromium.org> | 2017-07-04 21:41:31 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-07-04 21:41:31 -0700 |
| commit | d1185a8c5dd21182012e6dd531b00fd72f4d30cb (patch) | |
| tree | 1c394d6e27bad00e0f3aba4e59ca19823d0486d5 /arch/arm/mm | |
| parent | 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (diff) | |
| parent | 03232e0ddebdc2c9d088e6748075704885f039a5 (diff) | |
| download | linux-d1185a8c5dd21182012e6dd531b00fd72f4d30cb.tar.gz linux-d1185a8c5dd21182012e6dd531b00fd72f4d30cb.tar.bz2 linux-d1185a8c5dd21182012e6dd531b00fd72f4d30cb.zip | |
Merge branch 'merge/randstruct' into for-next/gcc-plugins
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-macros.S | 10 |
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 /* |